]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sun, 19 Jun 2011 22:49:22 +0000 (17:49 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 19 Jun 2011 22:49:22 +0000 (17:49 -0500)

Trivial merge