Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/net.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/wallet.cpp b/src/wallet.cpp
index 68d7e5acdb..9ce80e7044 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -633,7 +633,7 @@ void CWallet::ReacceptWalletTransactions()
             }
             else
             {
-                // Reaccept any txes of ours that aren't already in a block
+                // Re-accept any txes of ours that aren't already in a block
                 if (!wtx.IsCoinBase())
                     wtx.AcceptWalletTransaction(txdb, false);
             }
@@ -642,7 +642,7 @@ void CWallet::ReacceptWalletTransactions()
         {
             // TODO: optimize this to scan just part of the block chain?
             if (ScanForWalletTransactions(pindexGenesisBlock))
-                fRepeat = true;  // Found missing transactions: re-do Reaccept.
+                fRepeat = true;  // Found missing transactions: re-do re-accept.
         }
     }
 }