Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42044:1b3f25bf90e7 Date: 2011-02-16 15:52 +0100 http://bitbucket.org/pypy/pypy/changeset/1b3f25bf90e7/ Log: merge heads