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
........

svn path=/trunk/matplotlib/; revision=6582

Author: mdboom

TODO

@@ -1,3 +1,5 @@
+-- Test merging from multiple branches.
+
 -- ALMOST DONE : add print/save functionality.  Currently you can save by right
    clicking on the fig window, but you must have nothing in front of
    the window.  I suppose I need to first draw to a pixbuf.  I would
@@ -739,4 +741,4 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- support zoom to rect in x or y only
 
--- add Ryan's patch
+-- add Ryan's patch