Merge branch 'master' of github.com:coblee/p2pool
authorcoblee <chocobo@alum.mit.edu>
Mon, 7 Nov 2011 23:25:40 +0000 (15:25 -0800)
committercoblee <chocobo@alum.mit.edu>
Mon, 7 Nov 2011 23:25:40 +0000 (15:25 -0800)

Trivial merge