From: Peter Howkins <flibble@users.sourceforge.net>
Date: Fri, 23 Mar 2012 18:41:17 +0000 (+0000)
Subject: Merge branch 'linux1' of ssh://git.code.sf.net/p/cdesktopenv/code into linux1
X-Git-Tag: 2.2.0a~26^2~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f34a9a573fa402018c3f86fad27465a02345963b;p=oweals%2Fcde.git

Merge branch 'linux1' of ssh://git.code.sf.net/p/cdesktopenv/code into linux1
---

f34a9a573fa402018c3f86fad27465a02345963b