]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:25 +0000 (13:20 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:25 +0000 (13:20 -0400)

Trivial merge