matplotlib/matplotlib — pull request #649 by efiring (2011-12-31 22:46:32+00:00)
Title: Merge v1.1.x

Since I fouled up jkseppan's merge commit by botching the numpy version check fix, I decided to make a replacement so as to save him the trouble of doing it again. This replaces pull request #640.