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