Merge the conflict
[vuplus_openembedded] / opie-reader / opie-reader_1.1.7.oe