Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/merkleblock.h

@@ -67,7 +67,7 @@ protected:
         return (nTransactions+(1 << height)-1) >> height;
     }
 
-    /** calculate the hash of a node in the merkle tree (at leaf level: the txid's themselves) */
+    /** calculate the hash of a node in the merkle tree (at leaf level: the txid itself) */
     uint256 CalcHash(int height, unsigned int pos, const std::vector<uint256> &vTxid);
 
     /** recursive function that traverses tree nodes, storing the data as bits and hashes */