Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 22 Mar 2012 12:51:37 +0000 (08:51 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 22 Mar 2012 12:51:37 +0000 (08:51 -0400)

Trivial merge