Merge Opie-Console_CVS Conflict
[vuplus_openembedded] / libopie /
drwxr-xr-x   ..
drwxr-xr-x - libopie2
-rw-r--r-- 0 libopie2_1.1.6.oe
-rw-r--r-- 2753 libopie2_cvs.oe