]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2 (null)
authorBenjamin Peterson <benjamin@python.org>
Fri, 22 Jul 2011 15:55:25 +0000 (10:55 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 22 Jul 2011 15:55:25 +0000 (10:55 -0500)

Trivial merge