]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 27 Oct 2011 12:22:27 +0000 (08:22 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 27 Oct 2011 12:22:27 +0000 (08:22 -0400)

Trivial merge