Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42660:4187170af92e Date: 2011-03-15 18:08 +0100 http://bitbucket.org/pypy/pypy/changeset/4187170af92e/ Log: merge heads