Merged revisions 82022 via svnmerge from

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

................
  r82022 | senthil.kumaran | 2010-06-16 22:11:11 +0530 (Wed, 16 Jun 2010) | 9 lines

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

  ........
    r82018 | senthil.kumaran | 2010-06-16 20:25:31 +0530 (Wed, 16 Jun 2010) | 3 lines

    Fix Issue8937 - SimpleHTTPServer should contain usage example
  ........
................