Merged revisions 80256 via svnmerge from

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

................
  r80256 | senthil.kumaran | 2010-04-20 16:05:49 +0530 (Tue, 20 Apr 2010) | 9 lines

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

  ........
    r80236 | senthil.kumaran | 2010-04-20 12:24:59 +0530 (Tue, 20 Apr 2010) | 3 lines

    Fix Issue8460: Victor's patch to add timeout in test_urllib2net test_urls.
  ........
................