[pypy-svn] pypy default: Merged upstream (workin on train is fun!).

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r42188:04e742a4554d
Date: 2011-02-20 11:59 -0500
http://bitbucket.org/pypy/pypy/changeset/04e742a4554d/

Log:	Merged upstream (workin on train is fun!).