Merged revisions 79615 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79615 | georg.brandl | 2010-04-02 23:12:42 +0300 (Fri, 02 Apr 2010) | 1 line

  #8288: fix next -> __next__.
........

Doc/library/zipfile.rst

@@ -161,7 +161,7 @@ ZipFile Objects
 
       The file-like object is read-only and provides the following methods:
       :meth:`read`, :meth:`readline`, :meth:`readlines`, :meth:`__iter__`,
-      :meth:`next`.
+      :meth:`__next__`.
 
    .. note::