[pypy-svn] pypy default: Merge heads

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r41177:ca4c8c4a9f35
Date: 2011-01-21 19:09 +0100
http://bitbucket.org/pypy/pypy/changeset/ca4c8c4a9f35/

Log:	Merge heads