Conflicts:
	trunk/lib/installer-exclude/libjitsi.jar