Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42284:aa1abfba10e1 Date: 2011-02-25 15:41 +0100 http://bitbucket.org/pypy/pypy/changeset/aa1abfba10e1/ Log: merge heads