Merge branch 'checkkeys' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 31 Jan 2012 17:19:26 +0000 (12:19 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 31 Jan 2012 17:19:26 +0000 (12:19 -0500)

Trivial merge