Rolled back revisions 62038 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk
This was incorrectly merged.