Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Wed, 25 Jul 2012 00:46:29 +0000 (18:46 -0600)
committerJon Trulson <jon@radscan.com>
Wed, 25 Jul 2012 00:46:29 +0000 (18:46 -0600)

Trivial merge