Merge branch 'nullmodels' of https://github.com/laanwj/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 10 Nov 2011 15:30:24 +0000 (10:30 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 10 Nov 2011 15:30:24 +0000 (10:30 -0500)

Trivial merge