]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 19:30:03 +0000 (15:30 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 19:30:03 +0000 (15:30 -0400)

Trivial merge