]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 24 Oct 2011 12:52:30 +0000 (08:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 24 Oct 2011 12:52:30 +0000 (08:52 -0400)

Trivial merge