From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 20 Feb 2013 21:56:06 +0000 (-0500)
Subject: merge 3.3 (#17228)
X-Git-Tag: v3.4.0a1~1349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe40c252869264ff6cc42d3a91e38b3dad3b1b2;p=python

merge 3.3 (#17228)
---

abe40c252869264ff6cc42d3a91e38b3dad3b1b2
diff --cc Misc/NEWS
index ac29b186c7,1d4969da2b..8d935c66e5
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -940,12 -689,10 +940,14 @@@ Test
  Build
  -----
  
+ - Issue #17228: Fix building without pymalloc.
+ 
  - Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.
  
 +- Issue #16235: Implement python-config as a shell script.
 +
 +- Issue #16769: Remove outdated Visual Studio projects.
 +
  - Issue #17031: Fix running regen in cross builds.
  
  - Issue #3754: fix typo in pthread AC_CACHE_VAL.