[pypy-svn] pypy default: Merge default

[mfoord]

Author: Michael Foord <michael at voidspace.org.uk>
Branch: 
Changeset: r41076:a9124d5c301d
Date: 2011-01-20 19:42 +0100
http://bitbucket.org/pypy/pypy/changeset/a9124d5c301d/

Log:	Merge default