Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r40340:76b86c602e2e Date: 2011-01-03 17:52 +0100 http://bitbucket.org/pypy/pypy/changeset/76b86c602e2e/ Log: Merge heads.