]> granicus.if.org Git - python/commitdiff
Trunk merge.
authorBarry Warsaw <barry@python.org>
Mon, 4 Jun 2012 13:41:48 +0000 (09:41 -0400)
committerBarry Warsaw <barry@python.org>
Mon, 4 Jun 2012 13:41:48 +0000 (09:41 -0400)

Trivial merge