]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 22 Jul 2011 22:21:56 +0000 (17:21 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 22 Jul 2011 22:21:56 +0000 (17:21 -0500)

Trivial merge