Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	doc/unit-tests.txt
	src/serialize.h

1 files changed, 11 insertions, 5 deletions

diff --git a/src/bignum.h b/src/bignum.h
index abcc052efe..9f75d7c789 100644
--- a/src/bignum.h
+++ b/src/bignum.h
@@ -122,16 +122,22 @@ public:
             return (n > std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n);
     }
 
-    void setint64(int64 n)
+    void setint64(int64 sn)
     {
-        unsigned char pch[sizeof(n) + 6];
+        unsigned char pch[sizeof(sn) + 6];
         unsigned char* p = pch + 4;
-        bool fNegative = false;
-        if (n < (int64)0)
+        bool fNegative;
+        uint64 n;
+
+        if (sn < (int64)0)
         {
-            n = -n;
+            n = -sn;
             fNegative = true;
+        } else {
+            n = sn;
+            fNegative = false;
         }
+
         bool fLeadingZeroes = true;
         for (int i = 0; i < 8; i++)
         {