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

Conflicts:
	debian/watch