Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Fri, 3 Aug 2012 16:11:07 +0000 (17:11 +0100)
committerPeter Howkins <flibble@users.sf.net>
Fri, 3 Aug 2012 16:11:07 +0000 (17:11 +0100)

Trivial merge