Merging XORG-CURRENT into trunk
drwxr-xr-x - man
drwxr-xr-x - src