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