Merged revisions 79990 via svnmerge from

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

................
  r79990 | senthil.kumaran | 2010-04-12 12:33:17 +0530 (Mon, 12 Apr 2010) | 9 lines

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

  ........
    r79988 | senthil.kumaran | 2010-04-12 12:20:24 +0530 (Mon, 12 Apr 2010) | 3 lines

    Adding additional examples of valid urls as per RFC 3986 (for issue8339)
  ........
................