r19188: merge from samba3: