Merge branch '0.5.x' into 0.6.0.x

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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/net.h b/src/net.h
index ed9954bd7d..82316917d2 100644
--- a/src/net.h
+++ b/src/net.h
@@ -120,7 +120,7 @@ public:
     int64 nLastRecv;
     int64 nLastSendEmpty;
     int64 nTimeConnected;
-    unsigned int nHeaderStart;
+    signed int nHeaderStart;
     unsigned int nMessageStart;
     CAddress addr;
     int nVersion;