Merge branch 'fix_626' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 15:52:14 +0000 (10:52 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 15:52:14 +0000 (10:52 -0500)

Trivial merge