Merged revisions 68887 via svnmerge from

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

................
  r68887 | martin.v.loewis | 2009-01-24 15:10:07 +0100 (Sa, 24 Jan 2009) | 10 lines

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

  ........
    r68885 | martin.v.loewis | 2009-01-24 15:00:33 +0100 (Sa, 24 Jan 2009) | 3 lines

    Issue #4710: Extract directories properly in the zipfile module;
    allow adding directories to a zipfile.
  ........
................