Merged revisions 6581 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint
........ r6581 | mdboom | 2008-12-12 07:57:47 -0500 (Fri, 12 Dec 2008) | 1 line Trivial change to test merging ........
Authored by: mdboom 2008-12-12
Parent: [r6581]
Child: [r6583]