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