Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Tue, 18 Sep 2012 00:23:31 +0000 (18:23 -0600)
committerJon Trulson <jon@radscan.com>
Tue, 18 Sep 2012 00:23:31 +0000 (18:23 -0600)

Trivial merge