Author: Amaury Forgeot d'Arc <amauryfa at gmail.com> Branch: Changeset: r40258:320c78260143 Date: 2010-12-28 17:10 +0100 http://bitbucket.org/pypy/pypy/changeset/320c78260143/ Log: merge heads