Recorded merge of revisions 8907 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........ r8907 | efiring | 2011-01-11 22:04:06 -1000 (Tue, 11 Jan 2011) | 2 lines Backport 8657 from trunk; patch by C. Gohlke; closes 3151544 ........
Authored by: efiring 2011-01-12
Parent: [r8908]
Child: [r8910]