Author: Armin Rigo <arigo at tunes.org> Branch: Changeset: r42703:94dc9f22389a Date: 2011-03-16 05:58 -0400 http://bitbucket.org/pypy/pypy/changeset/94dc9f22389a/ Log: merge heads