Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r41396:94f022819171 Date: 2011-01-27 15:53 +0100 http://bitbucket.org/pypy/pypy/changeset/94f022819171/ Log: merge heads