Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r49621:9e1ad8713760 Date: 2011-11-21 15:29 +0100 http://bitbucket.org/pypy/pypy/changeset/9e1ad8713760/ Log: Attempt to kill 5225def4e322, which contains the broken merges 015d05dac523 and 4dcb9ca387a6.