Merge the conflict
[vuplus_openembedded] / libopietooth / libopietooth1_1.1.7.oe