Conflicts:
	cui/UIConfig_cui.mk

Change-Id: Idd4401966933da1e4de3e3f31f74e2908dd7d705
Reviewed-on: https://gerrit.libreoffice.org/4644Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>