]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 1 Sep 2011 20:33:56 +0000 (16:33 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 1 Sep 2011 20:33:56 +0000 (16:33 -0400)
1  2 
Objects/object.c

Simple merge