]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 19:11:45 +0000 (14:11 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 19:11:45 +0000 (14:11 -0500)

Trivial merge