Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Thu, 30 Aug 2012 19:53:37 +0000 (13:53 -0600)
committerJon Trulson <jon@radscan.com>
Thu, 30 Aug 2012 19:53:37 +0000 (13:53 -0600)

Trivial merge