Merged revisions 80677 via svnmerge from

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

................
  r80677 | senthil.kumaran | 2010-05-01 13:59:18 +0530 (Sat, 01 May 2010) | 9 lines

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

  ........
    r80675 | senthil.kumaran | 2010-05-01 13:31:56 +0530 (Sat, 01 May 2010) | 3 lines

    Fix issue8582: urllib.urlretrieve fails with ValueError: Invalid format string
  ........
................