]> granicus.if.org Git - python/commitdiff
merge 3.2 (#12417)
authorBenjamin Peterson <benjamin@python.org>
Mon, 27 Jun 2011 14:15:19 +0000 (09:15 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 27 Jun 2011 14:15:19 +0000 (09:15 -0500)

Trivial merge