From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 25 May 2011 16:26:32 +0000 (+0800)
Subject: merge commit.
X-Git-Tag: v3.3.0a1~2183^2~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=242926d227445857efd5981dab67cdaf5657e25a;p=thirdparty%2FPython%2Fcpython.git

merge commit.
---

242926d227445857efd5981dab67cdaf5657e25a
diff --cc Misc/NEWS
index 9ecd4a750676,cba2d50cdaf2..4009e74d0711
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -161,8 -161,8 +161,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11109 -  New service_action method for BaseServer, used by
 +  ForkingMixin class for cleanup. Initial Patch by Justin Wark.
++  
+ - Issue #12045: Avoid duplicate execution of command in ctypes.util._get_soname().
+   Patch by Sijin Joseph.
  
  - Issue #10818: Remove the Tk GUI and the serve() function of the pydoc module,
    pydoc -g has been deprecated in Python 3.2 and it has a new enhanced web