]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 3 Apr 2012 04:35:44 +0000 (00:35 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 3 Apr 2012 04:35:44 +0000 (00:35 -0400)

Trivial merge