Merge the conflict
[vuplus_openembedded] / opie-euroconv / opie-euroconv_1.1.7.oe