Merge branch '0.5.x' into 0.6.0.x

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

src/main.cpp

@@ -1840,7 +1840,7 @@ bool CheckDiskSpace(uint64 nAdditionalBytes)
         strMiscWarning = strMessage;
         printf("*** %s\n", strMessage.c_str());
         ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION);
-        CreateThread(Shutdown, NULL);
+        StartShutdown();
         return false;
     }
     return true;