]> granicus.if.org Git - python/commitdiff
merge 3.2 (null)
authorBenjamin Peterson <benjamin@python.org>
Wed, 23 Nov 2011 05:57:50 +0000 (23:57 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 23 Nov 2011 05:57:50 +0000 (23:57 -0600)

Trivial merge