Merge branch 'master' of git://git.code.sf.net/p/cdesktopenv/code into lucid
Merge branch 'master' into lucid

Build dtksh, other upstream fixes.
Merge branch 'master' into lucid