Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42024:4df39c33ef9c Date: 2011-02-16 11:07 +0100 http://bitbucket.org/pypy/pypy/changeset/4df39c33ef9c/ Log: merge heads