Merged revisions 85386-85387,85389 via svnmerge from

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

........
  r85386 | victor.stinner | 2010-10-13 00:23:23 +0200 (mer., 13 oct. 2010) | 3 lines

  Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the
  current directory was deleted.
........
  r85387 | victor.stinner | 2010-10-13 00:26:08 +0200 (mer., 13 oct. 2010) | 2 lines

  #6612: add the author of the patch (W. Trevor King)
........
  r85389 | victor.stinner | 2010-10-13 00:42:37 +0200 (mer., 13 oct. 2010) | 2 lines

  NEWS: Move #6612 to Library section
........

2 files changed, 6 insertions, 2 deletions

diff --git a/Misc/ACKS b/Misc/ACKS
index ea7d9da..982af4c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -418,6 +418,7 @@ Vivek Khera
 Akira Kitada
 Mads Kiilerich
 Taek Joo Kim
+W. Trevor King
 Paul Kippes
 Steve Kirsch
 Sebastian Kirsche
diff --git a/Misc/NEWS b/Misc/NEWS
index d86f34f..a19b478 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the
+  current directory was deleted. Patch written by W. Trevor King.
+
 - Issue #10045: Improved performance when writing after seeking past the
   end of the "file" in cStringIO.
 
@@ -108,7 +111,7 @@ Library
   to zero.
 
 - Issue #9816: random.Random.jumpahead(n) did not produce a sufficiently
-  different internal state for small values of n.  Fixed by salting the 
+  different internal state for small values of n.  Fixed by salting the
   value.
 
 - Issue #9792: In case of connection failure, socket.create_connection()
@@ -319,7 +322,7 @@ Extension Modules
 -----------------
 
 - Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression
-  introduced by issue #9324. 
+  introduced by issue #9324.
 
 - Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file
   descriptor is provided.  Patch by Pascal Chambon.