Some modifications for Python 2.6 support