Merge changes from r22a2-branch back into trunk. Also, change patch
level to 2.2a2+
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 3d22616..2c3b5dd 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,10 +23,10 @@
#define PY_MINOR_VERSION 2
#define PY_MICRO_VERSION 0
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_SERIAL 2
/* Version as a string */
-#define PY_VERSION "2.2a1+"
+#define PY_VERSION "2.2a2+"
/* 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 >= ... */