Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r41605:ef22897351e2 Date: 2011-02-04 12:02 +0100 http://bitbucket.org/pypy/pypy/changeset/ef22897351e2/ Log: merge heads