[pypy-commit] pypy py3k: merge default

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: py3k
Changeset: r62051:6b10ac90686d
Date: 2013-03-04 23:14 -0500
http://bitbucket.org/pypy/pypy/changeset/6b10ac90686d/

Log:	merge default