Merged revisions 8917 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........ r8917 | mdboom | 2011-01-14 13:15:33 -0500 (Fri, 14 Jan 2011) | 2 lines Fix doc build with recent versions of Sphinx (reported by Sandro Tosi) ........
Authored by: mdboom 2011-01-14
Parent: [r8917]
Child: [r8919]