merge 70783 to py3k
diff --git a/Misc/ACKS b/Misc/ACKS
index 03ed92d..bd300de 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -257,6 +257,7 @@
Jonathan Giddy
Johannes Gijsbers
Michael Gilfix
+Tim Golden
Chris Gonnerman
David Goodger
Hans de Graaff
@@ -794,4 +795,3 @@
Uwe Zessin
Tarek ZiadĀ
Peter Åstrand
-Jesse Noller
diff --git a/Misc/NEWS b/Misc/NEWS
index de4245a..894aa71 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,6 +49,9 @@
Library
-------
+- Issue #5261: Patch multiprocessing's semaphore.c to support context
+ manager use: "with multiprocessing.Lock()" works now.
+
- Issue #5236: Change time.strptime() to only take strings. Didn't work with
bytes already but the failure was non-obvious.