]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 15 May 2012 17:11:33 +0000 (10:11 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 15 May 2012 17:11:33 +0000 (10:11 -0700)

Trivial merge