Issue #3: previous commit is too hard for python 2.6.6