]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 21 Mar 2012 18:26:09 +0000 (14:26 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 21 Mar 2012 18:26:09 +0000 (14:26 -0400)

Trivial merge