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

Trivial merge