Merge the conflict
[vuplus_openembedded] / opie-sysinfo / opie-sysinfo_1.1.7.oe