]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 18 Aug 2011 18:55:38 +0000 (13:55 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 18 Aug 2011 18:55:38 +0000 (13:55 -0500)

Trivial merge