[pypy-commit] pypy default: hg merge

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: 
Changeset: r53013:3291a609bfd7
Date: 2012-02-29 09:15 +0100
http://bitbucket.org/pypy/pypy/changeset/3291a609bfd7/

Log:	hg merge

diff --git a/pypy/module/test_lib_pypy/test_collections.py b/pypy/module/test_lib_pypy/test_collections.py
--- a/pypy/module/test_lib_pypy/test_collections.py
+++ b/pypy/module/test_lib_pypy/test_collections.py
@@ -6,7 +6,7 @@
 
 from pypy.conftest import gettestobjspace
 
-class AppTestcStringIO:
+class AppTestCollections:
     def test_copy(self):
         import _collections
         def f():