Merged revisions 68900 via svnmerge from

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

................
  r68900 | mark.dickinson | 2009-01-24 16:22:21 +0000 (Sat, 24 Jan 2009) | 9 lines

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

  ........
    r68897 | mark.dickinson | 2009-01-24 16:17:27 +0000 (Sat, 24 Jan 2009) | 2 lines

    Issue #5025: Fix occasional test_kqueue failure on OS X.
  ........
................