Merged revisions 8815 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
Authored by: jouni 2010-12-05
Parent: [r8815]
Child: [r8817]