]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:29:50 +0000 (16:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:29:50 +0000 (16:29 -0500)

Trivial merge