Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Sat, 27 Dec 2014 23:15:02 +0000 (23:15 +0000)
committerPeter Howkins <flibble@users.sf.net>
Sat, 27 Dec 2014 23:15:02 +0000 (23:15 +0000)

Trivial merge