Merged revisions 81024 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81024 | mark.dickinson | 2010-05-09 13:16:29 +0100 (Sun, 09 May 2010) | 1 line

  Fix test_urllib2 failure on OS X.
........