Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42549:88380409d98d Date: 2011-03-13 11:49 +0100 http://bitbucket.org/pypy/pypy/changeset/88380409d98d/ Log: merge heads