Merged revisions 79849 via svnmerge from

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

................
  r79849 | antoine.pitrou | 2010-04-06 19:23:13 +0200 (mar., 06 avril 2010) | 9 lines

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

  ........
    r79848 | antoine.pitrou | 2010-04-06 19:21:09 +0200 (mar., 06 avril 2010) | 3 lines

    Issue #8193: Fix test_zlib failure with zlib 1.2.4.
  ........
................