null merge from 2.6
authorBarry Warsaw <barry@python.org>
Mon, 20 Feb 2012 19:45:45 +0000 (14:45 -0500)
committerBarry Warsaw <barry@python.org>
Mon, 20 Feb 2012 19:45:45 +0000 (14:45 -0500)

Trivial merge