]> granicus.if.org Git - python/commitdiff
merge 3.2 (null)
authorBenjamin Peterson <benjamin@python.org>
Thu, 8 Mar 2012 01:10:42 +0000 (19:10 -0600)
committerBenjamin Peterson <benjamin@python.org>
Thu, 8 Mar 2012 01:10:42 +0000 (19:10 -0600)

Trivial merge