From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Feb 2015 13:54:22 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.5.0a2~123^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03f8612562d509013c179c908815e78092a058ad;p=python

merge 3.2
---

03f8612562d509013c179c908815e78092a058ad
diff --cc Misc/README
index 118f6c7a80,7de627a92b..c1e890f8c0
--- a/Misc/README
+++ b/Misc/README
@@@ -18,11 -19,7 +18,10 @@@ python.man              UNIX man page f
  python.pc.in            Package configuration info template for pkg-config
  python-wing*.wpr        Wing IDE project file
  README                  The file you're reading now
 +README.AIX              Information about using Python on AIX
 +README.coverity         Information about running Coverity's Prevent on Python
  README.valgrind         Information for Valgrind users, see valgrind-python.supp
- RPM                     (Old) tools to build RPMs
 +svnmap.txt              Map of old SVN revs and branches to hg changeset ids
  SpecialBuilds.txt       Describes extra symbols you can set for debug builds
  TextMate                A TextMate bundle for Python development
  valgrind-python.supp    Valgrind suppression file, see README.valgrind