[Python-3000-checkins] r64678 - python/branches/py3k

[brett.cannon]

Author: brett.cannon
Date: Thu Jul  3 00:06:12 2008
New Revision: 64678

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)