Merge branch 'master' of https://github.com/bitcoin/bitcoin

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/bitcoinrpc.h
Simple merge

diff --cc src/headers.h
Simple merge

diff --cc src/init.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/script.cpp
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.cpp
Simple merge

diff --cc src/wallet.h
Simple merge