Merged revisions 87876-87877 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r87876 | georg.brandl | 2011-01-09 08:38:51 +0100 (So, 09 Jan 2011) | 1 line
#10869: do not visit root node twice in ast.increment_lineno().
........
r87877 | georg.brandl | 2011-01-09 08:50:48 +0100 (So, 09 Jan 2011) | 1 line
Add missing line.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 7af0b2c..6af7cf9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,9 @@
Library
-------
+- Issue #10869: Fixed bug where ast.increment_lineno modified the root
+ node twice.
+
- Issue #5871: email.header.Header.encode now raises an error if any
continuation line in the formatted value has no leading white space
and looks like a header. Since Generator uses Header to format all