Merge branch '0.6.0.x' into 0.6.x

Conflicts:
	src/bitcoinrpc.cpp
	src/db.cpp

diff --cc src/addrman.cpp
Simple merge

diff --cc src/addrman.h
Simple merge