Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Fri, 17 Aug 2012 09:26:09 +0000 (10:26 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Fri, 17 Aug 2012 09:26:09 +0000 (10:26 +0100)

Trivial merge