Merged revisions 67792 via svnmerge from

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

................
  r67792 | nick.coghlan | 2008-12-15 22:01:34 +1000 (Mon, 15 Dec 2008) | 9 lines

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

  ........
    r67790 | nick.coghlan | 2008-12-15 21:41:05 +1000 (Mon, 15 Dec 2008) | 1 line

    Issue #4197: Fix the remaining part of the doctest-in-zipfile problem by giving linecache access to the module globals when available
  ........
................