Merge branch '0.5.0.x' into 0.5.x

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/qt/bitcoin.cpp
index dd326a6,54e6bb3..b68eb82
--- 1/src/qt/bitcoin.cpp
--- 2/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@@ -161,9 -164,10 +164,10 @@@ int main(int argc, char *argv[]
          {
              {
                  // Put this in a block, so that BitcoinGUI is cleaned up properly before
 -                // calling Shutdown().
 +                // calling Shutdown() in case of exceptions.
                  BitcoinGUI window;
-                 splash.finish(&window);
+                 if (splashref)
+                     splash.finish(&window);
                  OptionsModel optionsModel(pwalletMain);
                  ClientModel clientModel(&optionsModel);
                  WalletModel walletModel(pwalletMain, &optionsModel);

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

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