Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/keystore.cpp

diff --cc src/crypter.cpp
Simple merge

diff --cc src/keystore.cpp
index e76f779,2e4de87..23f9e32
--- 1/src/keystore.cpp
--- 2/src/keystore.cpp
+++ b/src/keystore.cpp
@@@ -84,8 -71,9 +84,10 @@@ bool CCryptoKeyStore::Unlock(const CKey
              CSecret vchSecret;
              if(!DecryptSecret(vMasterKeyIn, vchCryptedSecret, Hash(vchPubKey.begin(), vchPubKey.end()), vchSecret))
                  return false;
+             if (vchSecret.size() != 32)
+                 return false;
              CKey key;
 +            key.SetPubKey(vchPubKey);
              key.SetSecret(vchSecret);
              if (key.GetPubKey() == vchPubKey)
                  break;
@@@ -146,7 -133,8 +148,9 @@@ bool CCryptoKeyStore::GetKey(const CBit
              CSecret vchSecret;
              if (!DecryptSecret(vMasterKey, vchCryptedSecret, Hash(vchPubKey.begin(), vchPubKey.end()), vchSecret))
                  return false;
+             if (vchSecret.size() != 32)
+                 return false;
 +            keyOut.SetPubKey(vchPubKey);
              keyOut.SetSecret(vchSecret);
              return true;
          }

diff --cc src/qt/bitcoingui.cpp
Simple merge