Merge branch 'cde-fixups-1' of ssh://git.code.sf.net/p/cdesktopenv/code into cde...
authorPeter Howkins <flibble@users.sf.net>
Mon, 23 Apr 2018 01:21:30 +0000 (02:21 +0100)
committerPeter Howkins <flibble@users.sf.net>
Mon, 23 Apr 2018 01:21:30 +0000 (02:21 +0100)

Trivial merge