]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 9 Aug 2012 00:22:57 +0000 (17:22 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 9 Aug 2012 00:22:57 +0000 (17:22 -0700)

Trivial merge