Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42994:601862ed288e Date: 2011-03-28 13:12 +0200 http://bitbucket.org/pypy/pypy/changeset/601862ed288e/ Log: merge heads