r20261: merge 20260 from samba_3_0_24