]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 20 Jun 2011 00:48:38 +0000 (19:48 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 20 Jun 2011 00:48:38 +0000 (19:48 -0500)

Trivial merge