[Python-3000] About to merge the py3k-pep3137 branch back into the py3k branch

[Guido van Rossum]

I'm going to merge the PEP 3137 branch back into Py3k, now that I've
got zero failing tests on Linux and OSX. Please no more checkins to
the py3k branch until I give the green light!

-- 
--Guido van Rossum (home page: http://www.python.org/~guido/)