Merge the conflict
[vuplus_openembedded] / opie-keyview / opie-keyview_1.1.7.oe