numpy/numpy — pull request #2840 by certik (2012-12-16 22:07:28+00:00)
Title: Pull request #445, rebased

I just rebased #445 on top of the latest master and resolved the conflicts.