Hurf durf merge conflict.

tests/nosewrapper.py

@@ -16,11 +16,11 @@ else:
     
 # hudson does a better job printing the test results if the exit value is 0
 zero_status = '--force-zero-status'
-if zero_status in sys.argv:
-    sys.argv.remove(zero_status)
+if zero_status in argv:
+    argv.remove(zero_status)
     launch = nose.run
 else:
     launch = nose.main
 
 from tests import eventlethub
-launch(addplugins=[eventlethub.EventletHub()])
+launch(addplugins=[eventlethub.EventletHub()], argv=argv)