Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r42168:84321e49b3c0 Date: 2011-02-18 14:02 +0100 http://bitbucket.org/pypy/pypy/changeset/84321e49b3c0/ Log: Merge heads