Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Sat, 27 Dec 2014 21:25:52 +0000 (14:25 -0700)
committerJon Trulson <jon@radscan.com>
Sat, 27 Dec 2014 21:25:52 +0000 (14:25 -0700)

Trivial merge