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

Trivial merge