Merge 3.3.

diff --cc Lib/test/test_threading.py
index 13c017da1daf5470a2792a7f6dee107f2af6a1d7,11e63d3e8304af4269f5b5ebc7fc56f46c66c30f..fff00f4bc51ec6427a979cffb44e6aa1fb230f16
--- 1/Lib/test/test_threading.py
--- 2/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@@ -451,7 -451,8 +451,8 @@@ class ThreadJoinOnShutdown(BaseTestCase
      # #12316 and #11870), and fork() from a worker thread is known to trigger
      # problems with some operating systems (issue #3863): skip problematic tests
      # on platforms known to behave badly.
-     platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5')
+     platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
 -                         'os2emx', 'hp-ux11')
++                         'hp-ux11')
  
      def _run_and_join(self, script):
          script = """if 1: