r10591: merges from SAMBA_3_0