matplotlib
diff --git a/‎API_CHANGES‎
Lines changed: 5 additions & 0 deletions b/‎API_CHANGES‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎CODING_GUIDE‎
Lines changed: 10 additions & 0 deletions b/‎CODING_GUIDE‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎examples/figimage_demo.py‎
Lines changed: 1 addition & 1 deletion b/‎examples/figimage_demo.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/matplotlib/image.py‎
Lines changed: 5 additions & 0 deletions b/‎lib/matplotlib/image.py‎
Lines changed: 5 additions & 0 deletions
@@ -1,3 +1,8 @@
+    Moved rec2gtk to matplotlib.toolkits.gtktools
+
+    Moved rec2excel to matplotlib.toolkits.exceltools
+
+
     Removed, dead/experimental ExampleInfo, Namespace and Importer
     code from matplotlib/__init__.py
 0.91.1 Released
 
@@ -113,6 +113,16 @@ noise in svn diffs.  If you are an emacs user, the following in your
 .emacs will cause emacs to strip trailing white space on save for
 python, C and C++
 
+
+When importing modules from the matplotlib namespace
+
+  import matplotlib.cbook as cbook   # DO
+  from matplotlib import cbook       #DONT
+
+because the latter is ambiguous whether cbook is a module or a
+function to the new developer.  The former makes it explcit that you
+are importing a module or package.
+
 ; and similarly for c++-mode-hook and c-mode-hook
 (add-hook 'python-mode-hook
           (lambda ()
 
@@ -13,7 +13,7 @@
 im1 = figimage(Z, xo=50,  yo=0)
 im2 = figimage(Z, xo=100, yo=100, alpha=.8)
 #gray()  # overrides current and sets default
-#savefig('figimage_demo')
+savefig('figimage_demo')
 
 show()
 
 
@@ -23,6 +23,7 @@
 from matplotlib._image import *
 
 class AxesImage(martist.Artist, cm.ScalarMappable):
+    zorder = 1
 
     def __init__(self, ax,
                  cmap = None,
@@ -517,18 +518,21 @@ def set_alpha(self, alpha):
         self.update_dict['array'] = True
 
 class FigureImage(martist.Artist, cm.ScalarMappable):
+    zorder = 1
     def __init__(self, fig,
                  cmap = None,
                  norm = None,
                  offsetx = 0,
                  offsety = 0,
                  origin=None,
+                 **kwargs
                  ):
 
         """
         cmap is a colors.Colormap instance
         norm is a colors.Normalize instance to map luminance to 0-1
 
+        kwargs are an optional list of Artist keyword args
         """
         martist.Artist.__init__(self)
         cm.ScalarMappable.__init__(self, norm, cmap)
@@ -537,6 +541,7 @@ def __init__(self, fig,
         self.figure = fig
         self.ox = offsetx
         self.oy = offsety
+        self.update(kwargs)
 
     def contains(self, mouseevent):
         """Test whether the mouse event occured within the image.