r11589: merging packaging changes from SAMBA_3_0