Fixed building CPython 2.4 and 2.5
Merge remote-tracking branch 'upstream/master'