Merged revisions 81522 via svnmerge from

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

................
  r81522 | r.david.murray | 2010-05-25 11:36:46 -0400 (Tue, 25 May 2010) | 9 lines

  Recorded merge of revisions 81521 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81521 | r.david.murray | 2010-05-25 11:32:06 -0400 (Tue, 25 May 2010) | 2 lines

    Issue 8818: urlparse/urlsplit keyword is 'scheme', not 'default_scheme'.
  ........
................