[pypy-svn] pypy default: Merged upstream.

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r41079:1f5c30d451ba
Date: 2011-01-20 12:48 -0600
http://bitbucket.org/pypy/pypy/changeset/1f5c30d451ba/

Log:	Merged upstream.