Merged revisions 64313 via svnmerge from

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

........
  r64313 | benjamin.peterson | 2008-06-16 15:18:18 -0500 (Mon, 16 Jun 2008) | 1 line

  fix Tools/scripts/2to3 as the result of a merge error
........