Fixed watch file
Merge branch 'debian-common' into ubuntu-natty