Merged revisions 68782 via svnmerge from

Merged revisions 68782 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68782 | benjamin.peterson | 2009-01-19 15:00:09 -0600 (Mon, 19 Jan 2009) | 9 lines

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

  ........
    r68779 | benjamin.peterson | 2009-01-19 11:37:42 -0600 (Mon, 19 Jan 2009) | 1 line

    make bad file descriptor tests more robust
  ........
................