]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 Jun 2011 23:50:21 +0000 (18:50 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 Jun 2011 23:50:21 +0000 (18:50 -0500)

Trivial merge