Merge branch 'master' of https://github.com/smola/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Wed, 23 Mar 2011 22:21:22 +0000 (18:21 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 23 Mar 2011 22:21:22 +0000 (18:21 -0400)

Trivial merge