Merge branch 'master' of https://github.com/devrandom/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Mar 2011 17:58:49 +0000 (12:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 10 Mar 2011 17:58:49 +0000 (12:58 -0500)

Trivial merge