]> granicus.if.org Git - python/commitdiff
merge 3.2 (null)
authorBenjamin Peterson <benjamin@python.org>
Thu, 1 Sep 2011 02:16:34 +0000 (22:16 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 1 Sep 2011 02:16:34 +0000 (22:16 -0400)

Trivial merge