r24538: merge from SAMBA_4_0: