]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 13 Apr 2012 22:06:42 +0000 (18:06 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 13 Apr 2012 22:06:42 +0000 (18:06 -0400)

Trivial merge