]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 19 Dec 2011 21:42:28 +0000 (16:42 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 19 Dec 2011 21:42:28 +0000 (16:42 -0500)

Trivial merge