Merge the conflict
[openembedded.git] / opie-mediaplayer1-libmadplugin / opie-mediaplayer1-libmadplugin_1.1.7.oe