Merge branch 'debian-experimental' into debian-unstable

Conflicts:

	debian/changelog
	debian/compat
	debian/control
	debian/libdrm-dev.install
	debian/rules
	debian/watch