Merge the conflict
[vuplus_openembedded] / opie-mediaplayer2 / opie-mediaplayer2-skin-techno_1.1.7.oe