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