Merge needs to wait until previous updates to file are merged.

Rolled back revisions 72062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k