Merged revisions 64677 via svnmerge from

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

........
  r64677 | brett.cannon | 2008-07-02 14:52:42 -0700 (Wed, 02 Jul 2008) | 2 lines

  Revert r64673 and instead just change the file encoding.
........