]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:35:12 +0000 (16:35 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:35:12 +0000 (16:35 -0500)

Trivial merge