Merge the conflict
[vuplus_openembedded] / opie-advancedfm / opie-advancedfm_1.1.7.oe