[pypy-svn] pypy default: merge heads

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r41326:cad9ffa5630b
Date: 2011-01-25 14:03 +0100
http://bitbucket.org/pypy/pypy/changeset/cad9ffa5630b/

Log:	merge heads