]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 24 May 2011 17:09:47 +0000 (12:09 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 24 May 2011 17:09:47 +0000 (12:09 -0500)

Trivial merge