]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorBrian Curtin <brian@python.org>
Wed, 13 Apr 2011 21:12:46 +0000 (16:12 -0500)
committerBrian Curtin <brian@python.org>
Wed, 13 Apr 2011 21:12:46 +0000 (16:12 -0500)

Trivial merge