[pypy-svn] pypy merge-stdlib: merged from default

[carljm]

Author: Carl Meyer <carl at oddbird.net>
Branch: merge-stdlib
Changeset: r42592:690d6c7070b6
Date: 2011-03-13 22:27 -0400
http://bitbucket.org/pypy/pypy/changeset/690d6c7070b6/

Log:	merged from default