r19063: merge from samba3