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

Trivial merge