Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bitcoind...