[pypy-commit] pypy closed-branches: Merge closed head 2f25f1d0005c on branch numpy-monkeyaround

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: closed-branches
Changeset: r50566:16c7651dc366
Date: 2011-12-15 14:01 +0100
http://bitbucket.org/pypy/pypy/changeset/16c7651dc366/

Log:	Merge closed head 2f25f1d0005c on branch numpy-monkeyaround