Merge branch '0.4.x' into 0.5.0.x

Conflicts:
	src/bitcoinrpc.cpp

diff --cc doc/README
index e3b8ffb,197f03d..6af11c3
--- 1/doc/README
--- 2/doc/README
+++ b/doc/README
@@@ -1,6 -1,6 +1,6 @@@
 -Bitcoin 0.4.4 BETA
 +Bitcoin 0.5.0.4 BETA
  
- Copyright (c) 2009-2011 Bitcoin Developers
+ Copyright (c) 2009-2012 Bitcoin Developers
  Distributed under the MIT/X11 software license, see the accompanying
  file license.txt or http://www.opensource.org/licenses/mit-license.php.
  This product includes software developed by the OpenSSL Project for use in

diff --cc doc/README_windows.txt
index b117f51,ad35713..25cb069
--- 1/doc/README_windows.txt
--- 2/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@@ -1,6 -1,6 +1,6 @@@
 -Bitcoin 0.4.4 BETA\r
 +Bitcoin 0.5.0.4 BETA\r
  \r
- Copyright (c) 2009-2011 Bitcoin Developers\r
+ Copyright (c) 2009-2012 Bitcoin Developers\r
  Distributed under the MIT/X11 software license, see the accompanying\r
  file license.txt or http://www.opensource.org/licenses/mit-license.php.\r
  This product includes software developed by the OpenSSL Project for use in\r

diff --cc src/headers.h
Simple merge

diff --cc src/net.h
Simple merge

diff --cc src/serialize.h
Simple merge

diff --cc src/util.cpp
Simple merge

diff --cc src/util.h
Simple merge

diff --cc src/wallet.h
Simple merge