Merge Opie-Console_CVS Conflict
[vuplus_openembedded] / opie-eye /
drwxr-xr-x   ..
-rw-r--r-- 0 opie-eye_1.1.6.oe
-rw-r--r-- 823 opie-eye_cvs.oe