Fix carp with python 2.6, realistically this needs FIXED to use the proper shared python files stuff in debian/ubuntu packaging
Merge branch 'master' into locsol/master