Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Thu, 16 Aug 2012 14:41:15 +0000 (15:41 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Thu, 16 Aug 2012 14:41:15 +0000 (15:41 +0100)

Trivial merge