Merged revisions 68137 via svnmerge from

Merged revisions 68137 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r68137 | georg.brandl | 2009-01-01 16:53:14 +0100 (Thu, 01 Jan 2009) | 10 lines

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

  ........
    r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines

    Patch #4739 by David Laban: add symbols to pydoc help topics,
    so that ``help('@')`` works as expected.
  ........
................