Author: Alex Gaynor <alex.gaynor at gmail.com> Branch: Changeset: r40827:65dada5b3f85 Date: 2011-01-17 18:32 -0600 http://bitbucket.org/pypy/pypy/changeset/65dada5b3f85/ Log: Merged upstream.