[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r66030:3daccc98b602
Date: 2013-08-09 10:47 +0200
http://bitbucket.org/pypy/pypy/changeset/3daccc98b602/

Log:	merge heads

diff --git a/rpython/rtyper/test/test_rlist.py b/rpython/rtyper/test/test_rlist.py
--- a/rpython/rtyper/test/test_rlist.py
+++ b/rpython/rtyper/test/test_rlist.py
@@ -190,7 +190,7 @@
         return True
 
 
-class BaseTestRlist(BaseRtypingTest):
+class TestRlist(BaseRtypingTest):
     type_system = 'lltype'
     rlist = ll_rlist