]> granicus.if.org Git - python/commitdiff
Forward merge.
authorBarry Warsaw <barry@python.org>
Mon, 23 May 2011 01:17:49 +0000 (21:17 -0400)
committerBarry Warsaw <barry@python.org>
Mon, 23 May 2011 01:17:49 +0000 (21:17 -0400)

Trivial merge