From 8404e78424fb55ff4285ea3e15be59094b3dd3f6 2008-08-13 20:23:56
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-08-13 20:23:56
Subject: [PATCH] Merge with upstream
---

diff --git a/IPython/Shell.py b/IPython/Shell.py
index 0f65813..a8fe13a 100644
--- a/IPython/Shell.py
+++ b/IPython/Shell.py
@@ -634,7 +634,7 @@ class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell):
 
     def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
                  user_ns=None,user_global_ns=None, **kw):
-        user_ns,b2 = self._matplotlib_config(name,user_ns)
+        user_ns,user_global_ns,b2 = self._matplotlib_config(name,user_ns,user_global_ns)
         MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
                                     banner2=b2,**kw)