Merge branch 'unstable' of github.com:forrestv/p2pool into unstable
authorForrest Voight <forrest@forre.st>
Tue, 30 Aug 2011 14:11:50 +0000 (10:11 -0400)
committerForrest Voight <forrest@forre.st>
Tue, 30 Aug 2011 14:11:50 +0000 (10:11 -0400)

Trivial merge