]> granicus.if.org Git - python/commitdiff
null merge from 2.6
authorBarry Warsaw <barry@python.org>
Thu, 23 Feb 2012 16:03:31 +0000 (11:03 -0500)
committerBarry Warsaw <barry@python.org>
Thu, 23 Feb 2012 16:03:31 +0000 (11:03 -0500)

Trivial merge