Merged revisions 76214 via svnmerge from

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

........
  r76214 | r.david.murray | 2009-11-11 13:07:27 -0500 (Wed, 11 Nov 2009) | 5 lines

  I got the relative magnitudes of the timeout increases reversed, so
  I'm bumping up the longer test to the 60 seconds I intended to make it.
  If this doesn't cure the intermittent buildbot timeouts, I'm going to
  turn that test into a warning rather than a failure.
........