Merge the conflict
[vuplus_openembedded] / opie-volumeapplet / opie-volumeapplet_1.1.7.oe