Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/net.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/crypter.cpp b/src/crypter.cpp
index 727cf090f..72d753a9c 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -20,7 +20,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
     if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
         return false;
 
-    // Try to keep the keydata out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
+    // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
     // Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
     // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.  
     mlock(&chKey[0], sizeof chKey);
@@ -47,7 +47,7 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigne
     if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_KEY_SIZE)
         return false;
 
-    // Try to keep the keydata out of swap
+    // Try to keep the key data out of swap
     // Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
     // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.  
     mlock(&chKey[0], sizeof chKey);