Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r40930:405a0ac07dd8 Date: 2011-01-19 17:03 +0100 http://bitbucket.org/pypy/pypy/changeset/405a0ac07dd8/ Log: merge heads