r15164: grab a few more changes from SAMBA_3_0