]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 29 Sep 2012 17:47:47 +0000 (13:47 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 29 Sep 2012 17:47:47 +0000 (13:47 -0400)

Trivial merge