]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 3 Jan 2012 22:30:47 +0000 (16:30 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 3 Jan 2012 22:30:47 +0000 (16:30 -0600)

Trivial merge