Previous commit broke compilation on Python < 2.6, it's now fixed