[Python-checkins] cpython (2.6): Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit

[barry.warsaw]

http://hg.python.org/cpython/rev/2d760cb20e1e
changeset:   70303:2d760cb20e1e
branch:      2.6
user:        Barry Warsaw <barry at python.org>
date:        Mon May 23 15:27:52 2011 -0400
summary:
  Replay changeset 70249:b571c7a8cf2e from fubar branch.  Original commit
message:

Merging post 2.6.7rc2 changes from Subversion.

files:
  Include/patchlevel.h |   2 +-
  Misc/NEWS            |  12 +++++++++++-
  2 files changed, 12 insertions(+), 2 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- 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
--- 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?
 ================================

-- 
Repository URL: http://hg.python.org/cpython