Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r41263:e7fed4502002 Date: 2011-01-24 17:51 +0100 http://bitbucket.org/pypy/pypy/changeset/e7fed4502002/ Log: merge heads