Merge branch 'master'of https://github.com/dmaxl/p2pool
Patched by hand since p2pool upstream is very far ahead.