Merge branch 'smalltxfix' of https://github.com/gavinandresen/bitcoin-git into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Mar 2011 19:32:19 +0000 (14:32 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 10 Mar 2011 19:32:19 +0000 (14:32 -0500)

Trivial merge