Rebase from 'debian/hydro/skeleton_markers'
Generated debian files for quantal