Author: Alex Gaynor <alex.gaynor at gmail.com> Branch: Changeset: r40740:d15aec423264 Date: 2011-01-16 22:38 -0600 http://bitbucket.org/pypy/pypy/changeset/d15aec423264/ Log: Merged upstream.