]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 19 Mar 2012 01:23:22 +0000 (21:23 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 19 Mar 2012 01:23:22 +0000 (21:23 -0400)

Trivial merge