merged traits fix on branch and trunk

ddale · ddale · commit a3487c53f195 · 2008-06-09T20:13:23.000Z
svn path=/trunk/matplotlib/; revision=5444
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,13 +1,11 @@
 2008-06-09 Committed Gregor's image resample patch to downsampling
            images with new rcparam image.resample - JDH
 
-
 2008-06-09 Don't install Enthought.Traits along with matplotlib. For 
            matplotlib developers convenience, it can still be 
            installed by setting an option in setup.cfg while we figure
            decide if there is a future for the traited config - DSD
 
-
 2008-06-09 Added range keyword arg to hist() - MM
 
 2008-06-07 Moved list of backends to rcsetup.py; made use of lower
