Merged revisions 85008,85011,85228,85240 via svnmerge from

Merged revisions 85008,85011,85228,85240 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85008 | georg.brandl | 2010-09-25 15:30:03 +0200 (Sa, 25 Sep 2010) | 1 line

  #9944: fix typo.
........
  r85011 | georg.brandl | 2010-09-25 18:56:36 +0200 (Sa, 25 Sep 2010) | 1 line

  #9562: slight clarification.
........
  r85228 | georg.brandl | 2010-10-05 09:16:01 +0200 (Di, 05 Okt 2010) | 1 line

  Indent version tags properly.
........
  r85240 | georg.brandl | 2010-10-06 07:08:32 +0200 (Mi, 06 Okt 2010) | 1 line

  #10034: import readline in longer example.
........