]> granicus.if.org Git - python/commitdiff
null merge from 2.6
authorBarry Warsaw <barry@python.org>
Wed, 20 Feb 2013 23:25:17 +0000 (18:25 -0500)
committerBarry Warsaw <barry@python.org>
Wed, 20 Feb 2013 23:25:17 +0000 (18:25 -0500)

Trivial merge