Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r41151:2eb560722ef9 Date: 2011-01-21 16:47 +0100 http://bitbucket.org/pypy/pypy/changeset/2eb560722ef9/ Log: Merge heads.