merge 3.1

diff --cc Include/patchlevel.h
index f1e619f05bbbc08cf82231affd8c58da34fc396f,58a79fef7fddd8c931ee41c12514d7ff38993188..e6a4902697d9a1b8a07175a57d159ab2c0d65c95
--- 1/Include/patchlevel.h
--- 2/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@@ -23,11 -23,12 +23,12 @@@
  #define PY_RELEASE_SERIAL     0
  
  /* Version as a string */
 -#define PY_VERSION            "3.1.3+"
 +#define PY_VERSION            "3.2.1a0"
  /*--end constants--*/
  
- /* Subversion Revision number of this file (not of the repository) */
- #define PY_PATCHLEVEL_REVISION  "$Revision$"
+ /* Subversion Revision number of this file (not of the repository). Empty
+    since Mercurial migration. */
+ #define PY_PATCHLEVEL_REVISION  ""
  
  /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
     Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */