From: Barry Warsaw <barry@python.org>
Date: Mon, 23 May 2011 19:27:52 +0000 (-0400)
Subject: Replay changeset 70249:b571c7a8cf2e from fubar branch.  Original commit
X-Git-Tag: v2.6.7~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32140f8955d454ba9bc5b4dc56e2b612beb2a4ad;p=python

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 a1e4f51b7b..b0f049e8b7 100644
--- 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 d1bbdba9a7..99935e90fd 100644
--- 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?
 ================================