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