Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r41089:36874fd140a0 Date: 2011-01-20 19:59 +0100 http://bitbucket.org/pypy/pypy/changeset/36874fd140a0/ Log: merge heads