unittest discover is not available in Python 2.6. Revert to 7f29234754be0f7d9a248ac0ef045d9306858eac.
Wrong comment is worse then no commit
Merge branch 'fix-tox-py26'