Merged revisions 81188 via svnmerge from

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

................
  r81188 | stefan.krah | 2010-05-15 11:41:27 +0200 (Sat, 15 May 2010) | 10 lines

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

  ........
    r81185 | stefan.krah | 2010-05-15 11:31:08 +0200 (Sat, 15 May 2010) | 4 lines

    If the timeout is exceeded, count the tests as skipped instead of just
    issuing a warning.
  ........
................