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__
........