Yet another Python 2.5 fix; I really ought to just set up my own 2.5 installation