[pypy-svn] pypy fast-forward: Merge heads

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: fast-forward
Changeset: r40624:6e697c05896c
Date: 2011-01-12 10:26 +0100
http://bitbucket.org/pypy/pypy/changeset/6e697c05896c/

Log:	Merge heads