Merged revisions 6816 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint
........ r6816 | jdh2358 | 2009-01-21 20:48:32 -0600 (Wed, 21 Jan 2009) | 1 line fixed a cocoaagg import bug ........
Authored by: jdh2358 2009-01-22
Parent: [r6816]
Child: [r6818]
