Merged revisions 80068 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80068 | georg.brandl | 2010-04-14 10:56:01 +0200 (Mi, 14 Apr 2010) | 1 line

  #5341: fix typo and adapt docstring syntax.
........