Merge branch 'chfix' of https://github.com/TheBlueMatt/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Tue, 24 May 2011 23:41:01 +0000 (19:41 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 24 May 2011 23:41:01 +0000 (19:41 -0400)

Trivial merge