merge 3.2

diff --cc Misc/README
index 118f6c7a801fe068a819ed2da105832134cc86b3,7de627a92b6c85381f980b888446b88ff9c820df..c1e890f8c0491e4901ddacd4bb07b109ec009b6b
--- 1/Misc/README
--- 2/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