]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 02:28:03 +0000 (21:28 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 02:28:03 +0000 (21:28 -0500)

Trivial merge