Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Mon, 27 Aug 2012 19:25:14 +0000 (20:25 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Mon, 27 Aug 2012 19:25:14 +0000 (20:25 +0100)

Trivial merge