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