Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r53258:2e76062efd46 Date: 2012-03-05 00:13 +0100 http://bitbucket.org/pypy/pypy/changeset/2e76062efd46/ Log: merge heads