trying to support python 2.6 for lucid
Merge branch 'master' into fuerte_release_candidate