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