Merge 3.3.

diff --cc Lib/test/test_os.py
index ff39c787d34f78b5c2c3aa5a65a4287c40474113,184c9ae31f70d77f094d42eaddab6c5acaef46d3..32a67e57c1779a8aadada7e06de33d0eac3b3f82
--- 1/Lib/test/test_os.py
--- 2/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@@ -1240,8 -1243,8 +1243,8 @@@ if sys.platform != 'win32'
  
          if hasattr(os, 'setgid'):
              def test_setgid(self):
-                 if os.getuid() != 0:
+                 if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
 -                    self.assertRaises(os.error, os.setgid, 0)
 +                    self.assertRaises(OSError, os.setgid, 0)
                  self.assertRaises(OverflowError, os.setgid, 1<<32)
  
          if hasattr(os, 'seteuid'):
@@@ -1252,8 -1255,8 +1255,8 @@@
  
          if hasattr(os, 'setegid'):
              def test_setegid(self):
-                 if os.getuid() != 0:
+                 if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
 -                    self.assertRaises(os.error, os.setegid, 0)
 +                    self.assertRaises(OSError, os.setegid, 0)
                  self.assertRaises(OverflowError, os.setegid, 1<<32)
  
          if hasattr(os, 'setreuid'):
@@@ -1272,8 -1275,8 +1275,8 @@@
  
          if hasattr(os, 'setregid'):
              def test_setregid(self):
-                 if os.getuid() != 0:
+                 if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
 -                    self.assertRaises(os.error, os.setregid, 0, 0)
 +                    self.assertRaises(OSError, os.setregid, 0, 0)
                  self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
                  self.assertRaises(OverflowError, os.setregid, 0, 1<<32)