]> granicus.if.org Git - python/commitdiff
merge 3.2 (#1616)
authorBenjamin Peterson <benjamin@python.org>
Tue, 6 Sep 2011 11:56:47 +0000 (07:56 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 6 Sep 2011 11:56:47 +0000 (07:56 -0400)

Trivial merge