importing: xorg-luit
non-ports-PKGBUILD: extra/xkeyboard-config
xkeyboard-config: pkgconfig dir
non-ports-PKGBUILD: xorg-setxkbmap
importing xterm - UNTESTED
non-ports-PKGBUILD: xorg-fonts-alias
non-ports: extra/xorg-mkfontscale
imported: xorg-fonts-encodings
UNTESTED: xf86-input-keyboard
UNTESTED: xf86-input-mouse
non-ports: extra/xorg-fonts-misc
Merge branch 'master' into xorg