]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 5 Jun 2011 03:09:08 +0000 (22:09 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 5 Jun 2011 03:09:08 +0000 (22:09 -0500)

Trivial merge