Merged revisions 72895 via svnmerge from

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

................
  r72895 | martin.v.loewis | 2009-05-24 21:47:22 +0200 (So, 24 Mai 2009) | 10 lines

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

  ........
    r72893 | martin.v.loewis | 2009-05-24 21:30:52 +0200 (So, 24 Mai 2009) | 3 lines

    Issue #6050: Don't fail extracting a directory from a zipfile if
    the directory already exists.
  ........
................