Merged revisions 8547 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib
........ r8547 | mdboom | 2010-07-14 09:50:41 -0400 (Wed, 14 Jul 2010) | 1 line Testing merging ........
Authored by: mdboom 2010-07-14
Parent: [r8547]
Child: [r8549]