Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r40792:36851ba2c507 Date: 2011-01-17 18:05 +0100 http://bitbucket.org/pypy/pypy/changeset/36851ba2c507/ Log: Merge heads