Merged revisions 80238 via svnmerge from

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

........
  r80238 | stefan.krah | 2010-04-20 09:59:10 +0200 (Tue, 20 Apr 2010) | 9 lines

  1) The timeout in the itimer tests was too low for slow or heavily
     loaded machines.

  2) Even with the increased timeout, the OS does not guarantee that
     a process will get a certain amount of virtual time in 60s, so
     the failure is changed to a diagnostic.
........