]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Wed, 19 Oct 2011 20:58:15 +0000 (16:58 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 19 Oct 2011 20:58:15 +0000 (16:58 -0400)
1  2 
Objects/genobject.c

Simple merge