]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 16 Mar 2012 15:13:30 +0000 (10:13 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 16 Mar 2012 15:13:30 +0000 (10:13 -0500)

Trivial merge