numpy/numpy — pull request #3415 by charris (2013-06-08 23:23:18+00:00)
Title: Pull 2699 rebased

Rebase #2699.