Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 29 Mar 2012 19:11:04 +0000 (15:11 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 29 Mar 2012 19:11:04 +0000 (15:11 -0400)

Trivial merge