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

Trivial merge