Author: Alex Gaynor <alex.gaynor at gmail.com> Branch: Changeset: r41462:2946d203f2d2 Date: 2011-01-29 13:49 -0500 http://bitbucket.org/pypy/pypy/changeset/2946d203f2d2/ Log: Merged upstream.