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

Conflicts:
	debian/watch