diff --git a/IPython/OInspect.py b/IPython/OInspect.py
index 979575a..0430c44 100644
--- a/IPython/OInspect.py
+++ b/IPython/OInspect.py
@@ -6,7 +6,7 @@ Uses syntax highlighting for presenting the various information elements.
 Similar in spirit to the inspect module, but all calls take a name argument to
 reference the name under which an object is being read.
 
-$Id: OInspect.py 2573 2007-08-01 14:55:46Z vivainio $
+$Id: OInspect.py 2584 2007-08-05 18:16:31Z fperez $
 """
 
 #*****************************************************************************
@@ -470,7 +470,8 @@ class Inspector:
                 # Skip Python's auto-generated docstrings
                 if class_ds and \
                        (class_ds.startswith('function(code, globals[,') or \
-                   class_ds.startswith('instancemethod(function, instance,')):
+                   class_ds.startswith('instancemethod(function, instance,') or \
+                   class_ds.startswith('module(name[,') ):
                     class_ds = None
                 if class_ds and ds != class_ds:
                     out.writeln(header('Class Docstring:\n') +