Author: Benjamin Peterson <benjamin at python.org> Branch: Changeset: r42361:50a0062831ab Date: 2011-02-28 21:55 -0600 http://bitbucket.org/pypy/pypy/changeset/50a0062831ab/ Log: merge with future fixes