Author: Benjamin Peterson <benjamin at python.org> Branch: Changeset: r41091:dfb199491dad Date: 2011-01-20 14:00 -0600 http://bitbucket.org/pypy/pypy/changeset/dfb199491dad/ Log: merge default