[pypy-svn] pypy refactor-not-in-translator: merge default

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: refactor-not-in-translator
Changeset: r42303:1c18e31f07ee
Date: 2011-02-25 20:11 +0100
http://bitbucket.org/pypy/pypy/changeset/1c18e31f07ee/

Log:	merge default