Merge branch 'fUseUPnPfix' of https://github.com/TheBlueMatt/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 12 May 2011 21:36:42 +0000 (17:36 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 12 May 2011 21:36:42 +0000 (17:36 -0400)

Trivial merge