Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/bitcoinrpc.cpp

diff --cc contrib/gitian-downloader/linux-download-config
Simple merge

diff --cc contrib/gitian-downloader/win32-download-config
Simple merge

diff --cc src/bitcoinrpc.cpp
index d8b9782,f10de69..a246677
--- 1/src/bitcoinrpc.cpp
--- 2/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@@ -2371,8 -2174,8 +2371,8 @@@ void ThreadRPCServer2(void* parg
              strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
          else if (mapArgs.count("-daemon"))
              strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
-         ::error(
+         ThreadSafeMessageBox(strprintf(
 -            _("Error: %s, you must set a rpcpassword in the configuration file:\n %s\n"
 +            _("%s, you must set a rpcpassword in the configuration file:\n %s\n"
                "It is recommended you use the following random password:\n"
                "rpcuser=bitcoinrpc\n"
                "rpcpassword=%s\n"

diff --cc src/noui.h
Simple merge

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

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

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

diff --cc src/qtui.h
Simple merge