]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Sun, 19 Jun 2011 20:56:56 +0000 (13:56 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Sun, 19 Jun 2011 20:56:56 +0000 (13:56 -0700)

Trivial merge