Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp

src/net.cpp

@@ -200,7 +200,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
     {
         // We should be phasing out our use of sites like these.  If we need
         // replacements, we should ask for volunteers to put this simple
-        // php file on their webserver that prints the client IP:
+        // php file on their web server that prints the client IP:
         //  <?php echo $_SERVER["REMOTE_ADDR"]; ?>
         if (nHost == 1)
         {
@@ -444,7 +444,7 @@ CNode* ConnectNode(CAddress addrConnect, int64 nTimeout)
         /// debug print
         printf("connected %s\n", addrConnect.ToString().c_str());
 
-        // Set to nonblocking
+        // Set to non-blocking
 #ifdef WIN32
         u_long nOne = 1;
         if (ioctlsocket(hSocket, FIONBIO, &nOne) == SOCKET_ERROR)
@@ -1588,7 +1588,7 @@ bool BindListenPort(string& strError)
 #endif
 
 #ifdef WIN32
-    // Set to nonblocking, incoming connections will also inherit this
+    // Set to non-blocking, incoming connections will also inherit this
     if (ioctlsocket(hListenSocket, FIONBIO, (u_long*)&nOne) == SOCKET_ERROR)
 #else
     if (fcntl(hListenSocket, F_SETFL, O_NONBLOCK) == SOCKET_ERROR)
@@ -1643,7 +1643,7 @@ void StartNode(void* parg)
         pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService("127.0.0.1", 0), nLocalServices));
 
 #ifdef WIN32
-    // Get local host ip
+    // Get local host IP
     char pszHostName[1000] = "";
     if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR)
     {
@@ -1657,7 +1657,7 @@ void StartNode(void* parg)
                 }
     }
 #else
-    // Get local host ip
+    // Get local host IP
     struct ifaddrs* myaddrs;
     if (getifaddrs(&myaddrs) == 0)
     {