Merge branch 'master' of https://github.com/tcatm/bitcoin into tcatm-master
authortcatm <tcatm@gawab.com>
Tue, 22 Feb 2011 02:00:09 +0000 (03:00 +0100)
committertcatm <tcatm@gawab.com>
Tue, 22 Feb 2011 02:00:09 +0000 (03:00 +0100)

Trivial merge