Recorded merge of revisions 76314 via svnmerge from

Recorded merge of revisions 76314 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76314 | nick.coghlan | 2009-11-16 09:04:33 +1000 (Mon, 16 Nov 2009) | 9 lines

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

  ........
    r76312 | nick.coghlan | 2009-11-16 08:36:47 +1000 (Mon, 16 Nov 2009) | 1 line

    Issue #7328: don't corrupt sys.path when running pydoc with the -m switch
  ........
................