Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61058-61061 via...

Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61058-61061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61058 | neal.norwitz | 2008-02-25 02:45:37 +0100 (Mon, 25 Feb 2008) | 1 line

  Fix indentation
........
  r61059 | brett.cannon | 2008-02-25 06:33:07 +0100 (Mon, 25 Feb 2008) | 2 lines

  Add minor markup for a string.
........
  r61060 | brett.cannon | 2008-02-25 06:33:33 +0100 (Mon, 25 Feb 2008) | 2 lines

  Fix a minor typo in a docstring.
........