Author: Daniel Roberts <Ademan555 at gmail.com> Branch: Changeset: r42434:6f7173d7683e Date: 2011-03-05 16:46 -0800 http://bitbucket.org/pypy/pypy/changeset/6f7173d7683e/ Log: Merging heads.