]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 Jun 2011 23:51:42 +0000 (18:51 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 Jun 2011 23:51:42 +0000 (18:51 -0500)

Trivial merge