]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 Apr 2012 17:50:05 +0000 (13:50 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 Apr 2012 17:50:05 +0000 (13:50 -0400)

Trivial merge