r22041: merge trivial changes from samba3