From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 17 Mar 2011 22:37:06 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~2891^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6826d2966b31671eea727f099e11290d432fae55;p=thirdparty%2FPython%2Fcpython.git

Merge
---

6826d2966b31671eea727f099e11290d432fae55
diff --cc Misc/NEWS
index 0828cd8df537,5732a0de6e85..bddfaf90cfbe
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,7 -10,10 +10,10 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #10914: fix bogus memory management in Modules/getpath.c, leading to
+   a possible crash when calling Py_SetPath().
+ 
 -- Issue #11510: Fixed optimizer bug which turned "a,b={1,1}" into "a,b=(1,1)".
 +- _ast.__version__ is now a Mercurial integer and hex revision.
  
  - Issue #11432: A bug was introduced in subprocess.Popen on posix systems with
    3.2.0 where the stdout or stderr file descriptor being the same as the stdin