[pypy-svn] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r43044:d2a2b45e9a14
Date: 2011-03-31 13:55 +0200
http://bitbucket.org/pypy/pypy/changeset/d2a2b45e9a14/

Log:	merge heads