null merge from 2.6
authorBarry Warsaw <barry@python.org>
Tue, 21 Feb 2012 15:23:27 +0000 (10:23 -0500)
committerBarry Warsaw <barry@python.org>
Tue, 21 Feb 2012 15:23:27 +0000 (10:23 -0500)

Trivial merge