Merge branch '0.6.0.x' into 0.6.x

Conflicts:
	src/init.cpp
	src/util.cpp

src/main.cpp

@@ -794,7 +794,7 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
 {
     int64 nSubsidy = 50 * COIN;
 
-    // Subsidy is cut in half every 4 years
+    // Subsidy is cut in half every 210000 blocks, which will occur approximately every 4 years
     nSubsidy >>= (nHeight / 210000);
 
     return nSubsidy + nFees;