r19693: merge from SAMBA_3_0_23 tree