Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42910:4e16d7f5af44 Date: 2011-03-24 19:34 +0100 http://bitbucket.org/pypy/pypy/changeset/4e16d7f5af44/ Log: merge heads