Merge the conflict
[vuplus_openembedded] / opie-multikeyapplet / opie-multikeyapplet_1.1.7.oe