small merges from SAMBA_3_0; mostly typos, renames, etc...