[merge] python 2.5 fixes

[Ben Finney]

Robert Collins <robertc at robertcollins.net> writes:

> Is python 2.5 final yet ? If not, I think this is better for 0.12.

Python 2.5 was released 2006-09-19.

    <URL:http://www.python.org/2.5/>

-- 
 \          "If nothing changes, everything will remain the same."  -- |
  `\                                                       Barne's Law |
_o__)                                                                  |
Ben Finney