Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r40887:5201a01f0d77 Date: 2011-01-18 18:19 +0100 http://bitbucket.org/pypy/pypy/changeset/5201a01f0d77/ Log: Merge heads.