Merge branch 'getblock'
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 3 Jan 2012 17:16:56 +0000 (12:16 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 3 Jan 2012 17:16:56 +0000 (12:16 -0500)

Trivial merge