Author: Hakan Ardo <hakan at debian.org> Branch: Changeset: r40591:86f1f211cfa3 Date: 2011-01-11 20:15 +0100 http://bitbucket.org/pypy/pypy/changeset/86f1f211cfa3/ Log: hg merge