diff -r 7c0cfc962994 -r 85659db71a05 src/SConscript
--- a/src/SConscript	Mon Dec 19 13:49:49 2011 +0000
+++ b/src/SConscript	Mon Dec 19 13:52:35 2011 +0000
@@ -851,8 +851,8 @@
         swig_env.Append(CCFLAGS='-Wno-uninitialized')
         swig_env.Append(CCFLAGS='-Wno-sign-compare')
         swig_env.Append(CCFLAGS='-Wno-parentheses')
+        swig_env.Append(CCFLAGS='-Wno-unused-label')
         if compareVersions(env['GCC_VERSION'], '4.6.0') != -1:
-            swig_env.Append(CCFLAGS='-Wno-unused-label')
             swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable')
 
     werror_env = new_env.Clone()
diff -r 7c0cfc962994 -r 85659db71a05 src/python/m5/params.py
--- a/src/python/m5/params.py	Mon Dec 19 13:49:49 2011 +0000
+++ b/src/python/m5/params.py	Mon Dec 19 13:52:35 2011 +0000
@@ -256,6 +256,9 @@
         self.ptype.cxx_predecls(code)
         code('%}')
         code()
+        # Make sure the SWIGPY_SLICE_ARG is defined through this inclusion
+        code('%include "std_container.i"')
+        code()
         self.ptype.swig_predecls(code)
         code()
         code('%include "std_vector.i"')