Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r41323:0103bc7abc5b Date: 2011-01-25 18:00 +0100 http://bitbucket.org/pypy/pypy/changeset/0103bc7abc5b/ Log: merge heads