Merge the conflict
[vuplus_openembedded] / opie-vmemo / opie-vmemo_1.1.7.oe