r19440: merged from samba3