Merge branch 'linux1' of ssh://git.code.sf.net/p/cdesktopenv/code into linux1
drwxr-xr-x - cde