Python 2.5.4
Merge pull request #564 from hanxue/python25

Python 2.5.4