numpy/numpy — pull request #3626 by charris (2013-08-16 00:45:54+00:00)
Title: gh-3397

This is a slight cleanup of #3397, put here for testing before commit.

Closes #3397.