merge from samba_3_0