Merge commit 'b976261' into stratum

Conflicts:
	NEWS

NEWS

@@ -1,5 +1,13 @@
 Version ??? - Future
 
+- Left align values that are suffix_string generated.
+- Share_diff should not be converting the work data to hex.
+- Off by one error.
+- Prevent overflows of the port char array in extract_sockaddr.
+- Disable stratum detection with scrypt.
+- Display the actual share diff next to the pool required diff, using a suffix
+creation function to prevent values of >1000 being shown in their entirety.
+- Fix 4 * 0 being 0 that would break dynamic intensity mode.
 - Supplement other 64-bit endian swap macros
 - Bugfix: Fix htobe64 on big endian platforms that don't define it
 - Fix lack of htobe64 on mingw32.

README

@@ -387,11 +387,10 @@ Or press any other key to continue
 
 The running log shows output like this:
 
- [2012-10-12 15:38:17] Accepted 78bb4861 Diff 2/1 GPU 1 pool 6
- [2012-10-12 15:38:17] Accepted f99b2b7a Diff 4/1 GPU 2 pool 6
- [2012-10-12 15:38:23] Accepted af298bef Diff 4/1 GPU 0 pool 6
- [2012-10-12 15:38:24] Accepted d04421af Diff 5/1 GPU 0 pool 6
- [2012-10-12 15:38:25] Accepted c18e5b5b Diff 4/1 GPU 3 pool 6
+ [2012-10-12 18:02:20] Accepted f0c05469 Diff 1/1 GPU 0 pool 1
+ [2012-10-12 18:02:22] Accepted 218ac982 Diff 7/1 GPU 1 pool 1
+ [2012-10-12 18:02:23] Accepted d8300795 Diff 1/1 GPU 3 pool 1
+ [2012-10-12 18:02:24] Accepted 122c1ff1 Diff 14/1 GPU 1 pool 1
 
 The 8 byte hex value are the 2nd 8 bytes of the share being submitted to the
 pool. The 2 diff values are the actual difficulty target that share reached