Merged revisions 66473 via svnmerge from

Merged revisions 66473 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r66473 | benjamin.peterson | 2008-09-15 18:55:01 -0500 (Mon, 15 Sep 2008) | 9 lines

  Merged revisions 66470 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r66470 | benjamin.peterson | 2008-09-15 18:29:43 -0500 (Mon, 15 Sep 2008) | 1 line

    don't use os.linesep for newlines; it breaks tests on windows
  ........
................