r1074: more compile fixes.....
tree2eeb008c20a7f138fc4e871c6bc306460115dfa8
drwxr-xr-x - SAMBA_3_2_MERGE
drwxr-xr-x - VOYAGER
drwxr-xr-x - abartlet-4_0