Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: fast-forward Changeset: r40465:14cc9b7eef81 Date: 2011-01-07 17:47 +0100 http://bitbucket.org/pypy/pypy/changeset/14cc9b7eef81/ Log: merge heads