[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r47240:100c7084f643
Date: 2011-09-13 10:26 +0200
http://bitbucket.org/pypy/pypy/changeset/100c7084f643/

Log:	merge

diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -44,7 +44,7 @@
     if w_iterable is not None:
         # unfortunately this is duplicating space.unpackiterable to avoid
         # assigning a new RPython list to 'wrappeditems', which defeats the
-        # W_FastSeqIterObject optimization.
+        # W_FastListIterObject optimization.
         if isinstance(w_iterable, W_ListObject):
             items_w.extend(w_iterable.wrappeditems)
         elif isinstance(w_iterable, W_TupleObject):