Some py2.6 fixes.
Merge pull request #267 from fedora-infra/feature/py2.6-fixes

Some py2.6 fixes.