Merge branch 'upnpfix' of https://github.com/TheBlueMatt/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 18 Apr 2011 18:53:13 +0000 (14:53 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 18 Apr 2011 18:53:13 +0000 (14:53 -0400)

Trivial merge