Merged revisions 68227 via svnmerge from

Merged revisions 68227 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r68227 | georg.brandl | 2009-01-03 22:26:05 +0100 (Sat, 03 Jan 2009) | 9 lines

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

  ........
    r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines

    Remove tabs from the documentation.
  ........
................