Merges.
[vuplus_openembedded] / xtst /
drwxr-xr-x   ..
-rw-r--r-- 607 xtst-cvs.oe
drwxr-xr-x - xtst-cvs