[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/f0d3a3699593
changeset:   68599:f0d3a3699593
parent:      68597:e33e45cc4ea8
parent:      68598:382cb3386d57
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 16 10:29:37 2011 -0500
summary:
  merge 3.2

files:
  Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,7 +73,7 @@
 -------
 
 - Issue #11133: fix two cases where inspect.getattr_static can trigger code
-  execution. Patch by Daniel Urban.
+  execution. Patch by Andreas Stührk.
 
 - Issue #11569: use absolute path to the sysctl command in multiprocessing to
   ensure that it will be found regardless of the shell PATH. This ensures

-- 
Repository URL: http://hg.python.org/cpython