r1072: few more compile fixes so I can start fresh
treee7a789f6eb7c19fb994172f819446e22bd239092
drwxr-xr-x - SAMBA_3_2_MERGE
drwxr-xr-x - VOYAGER
drwxr-xr-x - abartlet-4_0