Merge branch '0.6.0.x' into 0.6.x

Conflicts:
	src/init.cpp
	src/main.cpp
	src/serialize.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index afd249578b..d737657928 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1708,7 +1708,7 @@ Value encryptwallet(const Array& params, bool fHelp)
     // slack space in .dat files; that is bad if the old data is
     // unencrypted private keys.  So:
     StartShutdown();
-    return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet.  The keypool has been flushed, you need to make a new backup.";
+    return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
 }