Author: Alex Gaynor
Branch: kill-someobject
Changeset: r58043:6aca8686fd6f
Date: 2012-10-12 07:01 -0700
http://bitbucket.org/pypy/pypy/changeset/6aca8686fd6f/
Log:merged upstream
diff --git a/pypy/translator/c/test/test_genc.py
b/pypy/translator/c/test/test_genc.py
--- a/pypy/translator/c/t
Author: Alex Gaynor
Branch: kill-someobject
Changeset: r57925:a294d5b63ccf
Date: 2012-10-08 14:51 +0200
http://bitbucket.org/pypy/pypy/changeset/a294d5b63ccf/
Log:merged upstream
diff --git a/pypy/annotation/unaryop.py b/pypy/annotation/unaryop.py
--- a/pypy/annotation/unaryop.py
+++ b/pypy/