merge 3.3

diff --cc Misc/README
index e7780a2f315d63534dacb9025a0692eb0da3d237,c1e890f8c0491e4901ddacd4bb07b109ec009b6b..ddb8f3f975904a4c181c09852923b0b219609ee9
--- 1/Misc/README
--- 2/Misc/README
+++ b/Misc/README
@@@ -21,8 -21,9 +21,7 @@@ README                  The file you'r
  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
 +svnmap.txt              Map of old SVN revs and branches to hg changeset ids
  valgrind-python.supp    Valgrind suppression file, see README.valgrind
  vgrindefs               Python configuration for vgrind (a generic pretty printer)
 -Vim                     Python development utilities for the Vim editor