Apply this change from 2.6. Hopefully it doesn't cause a conflict.

I really want to test the buildbots.  This change is necessary
to get the test to be more stable and not crash due to previous
processes exitting.

Lib/test/test_socketserver.py

@@ -212,6 +212,7 @@ def test_main():
         # If the import lock is held, the threads will hang.
         raise TestSkipped("can't run when import lock is held")
 
+    reap_children()
     try:
         testall()
     finally: