]> granicus.if.org Git - python/commitdiff
Null merge from 2.6 branch.
authorBarry Warsaw <barry@python.org>
Mon, 23 May 2011 19:29:24 +0000 (15:29 -0400)
committerBarry Warsaw <barry@python.org>
Mon, 23 May 2011 19:29:24 +0000 (15:29 -0400)

Trivial merge