Merge branch 'kubuntu_unstable' of...

Merge branch 'kubuntu_unstable' of ssh://git.debian.org:/git/pkg-kde/frameworks/frameworkintegration into kubuntu_unstable

Conflicts:
	debian/changelog
	debian/control