]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 7 Mar 2011 00:10:58 +0000 (18:10 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 7 Mar 2011 00:10:58 +0000 (18:10 -0600)

Trivial merge