SIGN IN SIGN UP

Merge in changes from the 1.5.2p2 release.

Hopefully I got all this right!
F
Fred Drake committed
659ebfa79e891fc5e2480cd66c157970df57c451
Parent: eb725cd