Merged revisions 69131,69140-69141,69155 via svnmerge from

Merged revisions 69131,69140-69141,69155 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69131 | andrew.kuchling | 2009-01-31 04:26:02 +0100 (Sa, 31 Jan 2009) | 1 line

  Text edits and markup fixes
........
  r69140 | benjamin.peterson | 2009-01-31 17:52:03 +0100 (Sa, 31 Jan 2009) | 1 line

  PyErr_BadInternalCall() raises a SystemError, not TypeError #5112
........
  r69141 | benjamin.peterson | 2009-01-31 21:01:48 +0100 (Sa, 31 Jan 2009) | 1 line

  fix indentation
........
  r69155 | david.goodger | 2009-01-31 23:53:46 +0100 (Sa, 31 Jan 2009) | 1 line

  markup fix
........