Merged revisions 77060 via svnmerge from

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

................
  r77060 | senthil.kumaran | 2009-12-27 15:43:39 +0530 (Sun, 27 Dec 2009) | 10 lines

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

  ........
    r77058 | senthil.kumaran | 2009-12-27 14:41:09 +0530 (Sun, 27 Dec 2009) | 4 lines

    Fix for issue5625 - test_urllib2 fails - urlopen error file not on local host.
    This is on hosts with multiple ip addresses.
  ........
................