]> granicus.if.org Git - python/commitdiff
merge from 2.6 branch
authorSenthil Kumaran <orsenthil@gmail.com>
Thu, 17 Mar 2011 06:24:35 +0000 (14:24 +0800)
committerSenthil Kumaran <orsenthil@gmail.com>
Thu, 17 Mar 2011 06:24:35 +0000 (14:24 +0800)

Trivial merge