Author: Alex Gaynor <alex.gaynor at gmail.com> Branch: Changeset: r41196:fc300e4c3994 Date: 2011-01-21 19:17 -0600 http://bitbucket.org/pypy/pypy/changeset/fc300e4c3994/ Log: Merge upstream.