Merge branch 'master' of ssh://localhost:3333/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Tue, 18 Sep 2012 10:59:42 +0000 (11:59 +0100)
committerPeter Howkins <flibble@users.sf.net>
Tue, 18 Sep 2012 10:59:42 +0000 (11:59 +0100)

Trivial merge