Merged revisions 73931 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73931 | ezio.melotti | 2009-07-10 23:25:56 +0300 (Fri, 10 Jul 2009) | 1 line

  more cleanups and if zlib -> skipUnless(zlib)
........