Merge the conflict
[vuplus_openembedded] / opie-security /
drwxr-xr-x   ..
-rw-r--r-- 0 opie-security_1.1.7.oe
-rw-r--r-- 776 opie-security_cvs.oe