Conflicts:
	svtools/Library_svt.mk
q#

Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
Signed-off-by: Cor Nouws <oolst@nouenoff.nl>
Signed-off-by: Olivier Hallot <olivier.hallot@documentfoundation.org>
Signed-off-by: Adolfo Jayme Barrientos <fitoschido@ubuntu.com>
Signed-off-by: Michael Meeks <michael.meeks@suse.com>