Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r40297:2b40346b66e7 Date: 2010-12-30 21:40 +0100 http://bitbucket.org/pypy/pypy/changeset/2b40346b66e7/ Log: Merge heads.