Merge the conflict
[vuplus_openembedded] / opie-security / opie-security_1.1.7.oe