Conflicts:
	debian/changelog
	debian/control
	debian/rules

bzr revid: p_christ@hol.gr-20090824194522-tjcgw3u14ufirqo5