]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 3 Jan 2012 22:48:14 +0000 (16:48 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 3 Jan 2012 22:48:14 +0000 (16:48 -0600)
1  2 
Python/bltinmodule.c

Simple merge