Merge the conflict
[vuplus_openembedded] / opie-mediaplayer1-libwavplugin / opie-mediaplayer1-libwavplugin_1.1.7.oe