]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 25 Jan 2012 21:32:36 +0000 (16:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 25 Jan 2012 21:32:36 +0000 (16:32 -0500)

Trivial merge