]> granicus.if.org Git - python/commitdiff
Head merge
authorBarry Warsaw <barry@python.org>
Tue, 20 Sep 2011 18:58:19 +0000 (14:58 -0400)
committerBarry Warsaw <barry@python.org>
Tue, 20 Sep 2011 18:58:19 +0000 (14:58 -0400)

Trivial merge