Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Mon, 16 Jul 2012 20:26:53 +0000 (14:26 -0600)
committerJon Trulson <jon@radscan.com>
Mon, 16 Jul 2012 20:26:53 +0000 (14:26 -0600)

Trivial merge