]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 23 Feb 2012 20:20:08 +0000 (15:20 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 23 Feb 2012 20:20:08 +0000 (15:20 -0500)

Trivial merge