]> granicus.if.org Git - python/commitdiff
Upstream merge.
authorBarry Warsaw <barry@python.org>
Tue, 19 Jul 2011 23:27:21 +0000 (19:27 -0400)
committerBarry Warsaw <barry@python.org>
Tue, 19 Jul 2011 23:27:21 +0000 (19:27 -0400)

Trivial merge