]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:04:37 +0000 (00:04 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:04:37 +0000 (00:04 -0400)

Trivial merge