Merged revisions 67279 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67279 | martin.v.loewis | 2008-11-19 10:09:41 +0100 (Mi, 19 Nov 2008) | 2 lines

  Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 45e965b..9882957 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@
 Library
 -------
 
+- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
+
 - Issue #4307: The named tuple that ``inspect.getfullargspec()`` returns now
   uses ``kwonlydefaults`` instead of ``kwdefaults``.