]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 00:08:12 +0000 (19:08 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 00:08:12 +0000 (19:08 -0500)

Trivial merge