Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/main.cpp

diff --cc src/base58.h
Simple merge

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/crypter.cpp
Simple merge

diff --cc src/key.h
Simple merge

diff --cc src/main.cpp
index fade6a2,e6f9421..d72a131
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1482,10 -1462,10 +1482,10 @@@ bool CBlock::CheckBlock() cons
  
      // First transaction must be coinbase, the rest must not be
      if (vtx.empty() || !vtx[0].IsCoinBase())
 -        return error("CheckBlock() : first tx is not coinbase");
 +        return DoS(100, error("CheckBlock() : first tx is not coinbase"));
-     for (int i = 1; i < vtx.size(); i++)
+     for (unsigned int i = 1; i < vtx.size(); i++)
          if (vtx[i].IsCoinBase())
 -            return error("CheckBlock() : more than one coinbase");
 +            return DoS(100, error("CheckBlock() : more than one coinbase"));
  
      // Check transactions
      BOOST_FOREACH(const CTransaction& tx, vtx)

diff --cc src/main.h
Simple merge

diff --cc src/net.cpp
Simple merge

diff --cc src/net.h
Simple merge

diff --cc src/protocol.cpp
Simple merge

diff --cc src/util.cpp
Simple merge

diff --cc src/wallet.cpp
Simple merge

diff --cc src/wallet.h
Simple merge