Author: Laura Creighton <lac at openend.se> Branch: Changeset: r42781:53c2426b09b8 Date: 2011-03-18 13:19 +0100 http://bitbucket.org/pypy/pypy/changeset/53c2426b09b8/ Log: merge heads