[pypy-svn] pypy default: Merge, splerge

[mfoord]

Author: Michael Foord <michael at voidspace.org.uk>
Branch: 
Changeset: r40787:724343935cc1
Date: 2011-01-17 17:59 +0100
http://bitbucket.org/pypy/pypy/changeset/724343935cc1/

Log:	Merge, splerge