Merged revisions 77316 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r77316 | georg.brandl | 2010-01-05 11:22:04 +0100 (Di, 05 Jan 2010) | 1 line

  Assorted doc fixes by Florent.
........