]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 25 Mar 2011 21:58:31 +0000 (16:58 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 25 Mar 2011 21:58:31 +0000 (16:58 -0500)

Trivial merge