SIGN IN SIGN UP

Manually patched a few things that didn't get merged in, but should.

G
Guido van Rossum committed
da27fd267346e213512f4835dd0b7b40e6172bbe
Parent: af554a0