Merge branch 'desktop' of a.arcui.com:zackcfgs into gentoo-desktop
Merge branch 'gentoo-desktop' of github.com:zgilburd/cfg into gentoo-desktop