[python-committers] svnmerge to 2.6 branch