Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Thu, 30 Aug 2012 20:38:11 +0000 (21:38 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Thu, 30 Aug 2012 20:38:11 +0000 (21:38 +0100)

Trivial merge