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

Trivial merge