]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 14 Jul 2011 15:03:53 +0000 (10:03 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 14 Jul 2011 15:03:53 +0000 (10:03 -0500)

Trivial merge