Merged revisions 78164 via svnmerge from

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

................
  r78164 | ezio.melotti | 2010-02-12 02:28:42 +0200 (Fri, 12 Feb 2010) | 9 lines

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

  ........
    r78162 | ezio.melotti | 2010-02-12 01:50:57 +0200 (Fri, 12 Feb 2010) | 1 line

    #7907: fix wrong function name in doc. Patch by Brian Curtin.
  ........
................