Author: Alex Gaynor <alex.gaynor at gmail.com> Branch: Changeset: r42095:4dcb06422e19 Date: 2011-02-17 00:14 -0500 http://bitbucket.org/pypy/pypy/changeset/4dcb06422e19/ Log: Merged upstream.