Merge the conflict
[vuplus_openembedded] / opie-today-fortuneplugin / opie-today-fortuneplugin_1.1.7.oe