Rebase from 'debian/groovy/nao_bringup'
Generated debian files for oneiric