Merge the conflict
[vuplus_openembedded] / opie-systemtime / opie-systemtime_1.1.7.oe