Merged revisions 80959 via svnmerge from

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

................
  r80959 | senthil.kumaran | 2010-05-08 10:42:05 +0530 (Sat, 08 May 2010) | 9 lines

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

  ........
    r80957 | senthil.kumaran | 2010-05-08 10:30:11 +0530 (Sat, 08 May 2010) | 2 lines

    Fixing the errors trigerred in test_urllib2net. Related to issue8656.
  ........
................