Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r40968:111aaef80c76 Date: 2011-01-20 10:25 +0100 http://bitbucket.org/pypy/pypy/changeset/111aaef80c76/ Log: Merge heads.