Merge the conflict
[vuplus_openembedded] / opie-zsafe / opie-zsafe_1.1.7.oe