]> granicus.if.org Git - python/commitdiff
null merge from 2.6
authorBarry Warsaw <barry@python.org>
Wed, 22 Feb 2012 19:27:53 +0000 (14:27 -0500)
committerBarry Warsaw <barry@python.org>
Wed, 22 Feb 2012 19:27:53 +0000 (14:27 -0500)

Trivial merge