Merged revisions 78622 via svnmerge from

Merged revisions 78622 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78622 | florent.xicluna | 2010-03-03 12:54:54 +0100 (mer, 03 mar 2010) | 9 lines

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

  ........
    r78620 | florent.xicluna | 2010-03-03 12:49:53 +0100 (mer, 03 mar 2010) | 2 lines

    Revert a nonexistent docstring typo, r42805.
  ........
................