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

........
  r80939 | benjamin.peterson | 2010-05-07 15:45:07 -0500 (Fri, 07 May 2010) | 1 line

  revert r80932; it breaks windows
........
2 files changed