]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:10:07 +0000 (16:10 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:10:07 +0000 (16:10 -0400)

Trivial merge