Author: Alexander Hesse
Branch: quiet-rpython
Changeset: r60759:a493f5ab195e
Date: 2013-01-31 11:18 +0100
http://bitbucket.org/pypy/pypy/changeset/a493f5ab195e/
Log:hg merge default
diff --git a/lib-python/2.7/inspect.py b/lib-python/2.7/inspect.py
--- a/lib-python/2.7/inspect.py
+++ b/lib-p
Author: Alexander Hesse
Branch: quiet-rpython
Changeset: r60671:f169915b9457
Date: 2013-01-29 13:15 +0100
http://bitbucket.org/pypy/pypy/changeset/f169915b9457/
Log:hg merge default
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/con
