From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 18 Dec 2011 18:28:33 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.3rc1~271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a74252633f2d86b3108b80c929583abd4193d7be;p=thirdparty%2FPython%2Fcpython.git

Merge
---

a74252633f2d86b3108b80c929583abd4193d7be
diff --cc Misc/NEWS
index 7dbaaff5f6af,4be3a6b6f8f0..95c814748b87
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -97,9 -97,9 +97,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #7502: Fix equality comparison for DocTestCase instances.  Patch by
 +  Cédric Krier.
 +
+ - Issue #11870: threading: Properly reinitialize threads internal locks and
+   condition variables to avoid deadlocks in child processes.
+ 
  - Issue #8035: urllib: Fix a bug where the client could remain stuck after a
    redirection or an error.