I've merged most of the remaining changes to Py3k, with two exceptions: * The bsddb upgrade (same reason as last time: #2887) * The ssl changes (Bill, you said you had a separately maintained copy for 3k) Georg