Merged revisions 64260 via svnmerge from

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

........
  r64260 | martin.v.loewis | 2008-06-14 02:41:41 +0200 (Sa, 14 Jun 2008) | 2 lines

  Revert eol-style to CRLF.
........