Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Sun, 26 May 2013 23:48:55 +0000 (17:48 -0600)
committerJon Trulson <jon@radscan.com>
Sun, 26 May 2013 23:48:55 +0000 (17:48 -0600)

Trivial merge