Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bitcoind...
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 18:58:37 +0000 (18:58 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 18:58:37 +0000 (18:58 +0000)

Trivial merge