]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 3 Jun 2011 22:50:59 +0000 (17:50 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 3 Jun 2011 22:50:59 +0000 (17:50 -0500)

Trivial merge