tree d26d06d629882843395490475cbd3bd164c7d721
parent ddb62e9f4c2a9efb707892b292b484e25c09db51
author Senthil Kumaran <orsenthil@gmail.com> 1277734338 +0000
committer Senthil Kumaran <orsenthil@gmail.com> 1277734338 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4082327

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.
  ........
................