Merge the conflict
[vuplus_openembedded] / libmailwrapper / libmailwrapper_1.1.7.oe