r20245: merge 20244 from samba_3_0_24