Author: Antonio Cuni <anto.cuni at gmail.com> Branch: Changeset: r42738:cbc7eb739340 Date: 2011-03-17 18:03 +0100 http://bitbucket.org/pypy/pypy/changeset/cbc7eb739340/ Log: merge heads