diff -r 8b5f900233ee -r 4c0be6f4da7a src/python/m5/__init__.py
--- a/src/python/m5/__init__.py	Wed Apr 13 09:32:19 2011 -0700
+++ b/src/python/m5/__init__.py	Wed Apr 13 09:44:56 2011 -0700
@@ -31,8 +31,13 @@
 # scripts while allowing new SCons code to operate properly.
 
 try:
-    import internal
+    # Try to import something that's generated by swig
+    import internal.core
+
+    # Try to grab something from it in case demandimport is being used
+    internal.core.__package__
 except ImportError:
+    # The import failed
     internal = None
 
 if internal: