Merge the conflict
[vuplus_openembedded] / libopieobex / libopieobex0_1.1.7.oe