Merged revisions 74063 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

NB: the news item for r73708 seems to have inadvertently been included in a
different, unrelated merge set (r74055).  I restored it here.

................
  r74063 | alexandre.vassalotti | 2009-07-17 08:07:01 -0400 (Fri, 17 Jul 2009) | 17 lines

  Merged revisions 73694,73708,73738 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73694 | jesse.noller | 2009-06-29 14:24:26 -0400 (Mon, 29 Jun 2009) | 1 line

    Issue 5740: multiprocessing.connection.* authkey fixes
  ........
    r73708 | jesse.noller | 2009-06-30 13:11:52 -0400 (Tue, 30 Jun 2009) | 1 line

    Resolves issues 5155, 5313, 5331 - bad file descriptor error with processes in processes
  ........
    r73738 | r.david.murray | 2009-06-30 22:49:10 -0400 (Tue, 30 Jun 2009) | 2 lines

    Make punctuation prettier and break up run-on sentence.
  ........
................

2 files changed, 7 insertions, 0 deletions

diff --git a/Misc/ACKS b/Misc/ACKS
index 0fa88ed..43dcb86 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -45,6 +45,7 @@ Des Barry
 Ulf Bartelt
 Nick Bastin
 Jeff Bauer
+Mike Bayer
 Michael R Bax
 Anthony Baxter
 Samuel L. Bayer
@@ -184,6 +185,7 @@ Cesar Douady
 Dean Draayer
 John DuBois
 Paul Dubois
+Graham Dumpleton
 Quinn Dunkan
 Robin Dunn
 Luke Dunstan
@@ -556,6 +558,7 @@ Steven Pemberton
 Santiago Peresón
 Mark Perrego
 Trevor Perrin
+Gabriel de Perthuis
 Tim Peters
 Benjamin Peterson
 Chris Petrilli
diff --git a/Misc/NEWS b/Misc/NEWS
index a882c9c..e867539 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,10 @@ C-API
 Library
 -------
 
+- Issues #5155, #5313, #5331: multiprocessing.Process._bootstrap was
+  unconditionally calling "os.close(sys.stdin.fileno())" resulting in file
+  descriptor errors
+
 - Issue #1424152: Fix for http.client, urllib.request to support SSL while
   working through proxy. Original patch by Christopher Li, changes made by
   Senthil Kumaran