Merge branch 'linux1' of ssh://git.code.sf.net/p/cdesktopenv/code into linux1
authorPeter Howkins <flibble@users.sourceforge.net>
Fri, 23 Mar 2012 18:41:17 +0000 (18:41 +0000)
committerPeter Howkins <flibble@users.sourceforge.net>
Fri, 23 Mar 2012 18:41:17 +0000 (18:41 +0000)

Trivial merge