Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Fri, 27 Jul 2012 13:43:33 +0000 (14:43 +0100)
committerPeter Howkins <flibble@users.sf.net>
Fri, 27 Jul 2012 13:43:33 +0000 (14:43 +0100)

Trivial merge