Merge the conflict
[vuplus_openembedded] / opie-clock / opie-clock_1.1.7.oe