Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r55096:56ab50a13380 Date: 2012-05-15 11:10 +0200 http://bitbucket.org/pypy/pypy/changeset/56ab50a13380/ Log: merge heads