]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 20 Dec 2011 16:13:05 +0000 (10:13 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 20 Dec 2011 16:13:05 +0000 (10:13 -0600)

Trivial merge