py2.6 compat
Merge pull request #581 from ged-lab/fix/579py2.6

py2.6 compat