SIGN IN SIGN UP

Merge refactoring I did when committing r72267 to trunk into the

already committed issue4751 support in py3k r68411.
G
Gregory P. Smith committed
3f61d61b353c08525348a018294fa05bba1bdfe2
Parent: c1651a0