Merged revisions 79529 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk