Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:34:13 +0000 (15:34 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:34:13 +0000 (15:34 -0400)

Trivial merge