Author: Carl Friedrich Bolz <cfbolz at gmx.de> Branch: Changeset: r42619:35bf8d02c1e1 Date: 2011-03-14 17:38 +0100 http://bitbucket.org/pypy/pypy/changeset/35bf8d02c1e1/ Log: merge