Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42200:986fc8b4c759 Date: 2011-02-21 15:13 +0000 http://bitbucket.org/pypy/pypy/changeset/986fc8b4c759/ Log: merge heads