Merge the conflict
[vuplus_openembedded] / opie-sounds / opie-sounds_1.1.7.oe