]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 12 Jan 2012 02:00:48 +0000 (21:00 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 12 Jan 2012 02:00:48 +0000 (21:00 -0500)
1  2 
Python/bltinmodule.c

Simple merge