]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 4 Jul 2011 00:21:44 +0000 (17:21 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 4 Jul 2011 00:21:44 +0000 (17:21 -0700)

Trivial merge