Merged revisions 82326 via svnmerge from

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

................
  r82326 | senthil.kumaran | 2010-06-28 19:38:00 +0530 (Mon, 28 Jun 2010) | 9 lines

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

  ........
    r82324 | senthil.kumaran | 2010-06-28 19:26:46 +0530 (Mon, 28 Jun 2010) | 3 lines

    Fix Issue8653 - Docstring for urlunsplit function.
  ........
................