Fixes 2 known incompatibilities with Python 2.6
Merge pull request #174 from huguesv/python26

Fixes 2 known incompatibilities with Python 2.6