Merged revisions 78806 via svnmerge from

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

........
  r78806 | benjamin.peterson | 2010-03-08 16:15:11 -0600 (Mon, 08 Mar 2010) | 1 line

  set svn:eol-style on various files
........