Fixed Merge issues
[vicar] / qtc_packaging / debian_harmattan / manifest.aegis_old