Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42224:fb46285d3360 Date: 2011-02-23 13:54 +0000 http://bitbucket.org/pypy/pypy/changeset/fb46285d3360/ Log: merge heads