Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit

message:

Merging post 2.6.7rc2 changes from Subversion.

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index a1e4f51b7ba3675263b3caaeaf31058ed24464c7..b0f049e8b79bc0667fb02573028e95051d3d22bf 100644 (file)
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -27,7 +27,7 @@
 #define PY_RELEASE_SERIAL      2
 
 /* Version as a string */
-#define PY_VERSION             "2.6.7rc2"
+#define PY_VERSION             "2.6.7rc2+"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */

diff --git a/Misc/NEWS b/Misc/NEWS
index d1bbdba9a75f88547b543f65a72168b69aaef516..99935e90fd34103f0a116f91451c1030daecc118 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,7 +2,17 @@
 Python News
 +++++++++++
 
-(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 2.6.7?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
 
 What's New in Python 2.6.7 rc 2?
 ================================