]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 14:40:20 +0000 (10:40 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 14:40:20 +0000 (10:40 -0400)

Trivial merge