Merged revisions 80953 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80953 | senthil.kumaran | 2010-05-08 08:41:50 +0530 (Sat, 08 May 2010) | 3 lines

  Fix Issue8656 - urllib2 mangles file://-scheme URLs
........