Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r41916:b21c05bdaca0 Date: 2011-02-14 18:30 +0100 http://bitbucket.org/pypy/pypy/changeset/b21c05bdaca0/ Log: merge heads