]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 27 Jun 2011 16:07:14 +0000 (09:07 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 27 Jun 2011 16:07:14 +0000 (09:07 -0700)

Trivial merge