Merged revisions 58198-58202 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r58198 | thomas.wouters | 2007-09-19 01:27:30 +0200 (Wed, 19 Sep 2007) | 5 lines

  Properly indent two lines. (Spotted because it caused merge conflicts in the
  py3k branch ;)
........
  r58199 | sean.reifschneider | 2007-09-19 01:34:44 +0200 (Wed, 19 Sep 2007) | 2 lines

  issue1172: Documentation of "done" attribute in cgi module.
........