Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git