]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:07:05 +0000 (00:07 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:07:05 +0000 (00:07 -0400)

Trivial merge