Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Sat, 1 Sep 2012 17:30:13 +0000 (18:30 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Sat, 1 Sep 2012 17:30:13 +0000 (18:30 +0100)

Trivial merge