Merge branch '0.6.x' into 0.7.x

Conflicts:
	src/main.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index b63d68187c..3c5aa6312f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1484,7 +1484,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
     }
 
     if (vtx[0].GetValueOut() > GetBlockValue(pindex->nHeight, nFees))
-        return error("ConnectBlock() : coinbase pays too much (actual=%lld vs limit=%lld)", (long long)vtx[0].GetValueOut(), (long long)GetBlockValue(pindex->nHeight, nFees));
+        return error("ConnectBlock() : coinbase pays too much (actual=%"PRI64d" vs limit=%"PRI64d")", vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees));
 
     if (fJustCheck)
         return true;