Merge the conflict
[vuplus_openembedded] / opie-theme / opie-theme_1.1.7.oe