]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 24 Feb 2012 16:49:07 +0000 (11:49 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 24 Feb 2012 16:49:07 +0000 (11:49 -0500)

Trivial merge