Merged revisions 69494 via svnmerge from

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

........
  r69494 | hirokazu.yamamoto | 2009-02-10 22:31:28 +0900 | 1 line

  Fixed svn:eol-style.
........