]> granicus.if.org Git - python/commitdiff
merge 3.2 (#12719)
authorBenjamin Peterson <benjamin@python.org>
Tue, 9 Aug 2011 21:15:29 +0000 (16:15 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 9 Aug 2011 21:15:29 +0000 (16:15 -0500)

Trivial merge