Merged revisions 8519 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........ r8519 | mdboom | 2010-07-06 11:31:53 -0400 (Tue, 06 Jul 2010) | 1 line Testing merging (removing bogus content) ........
Authored by: mdboom 2010-07-06
Parent: [r8519]
Child: [r8521]