remove convert_smbpasswd and addtosmbpass from tree; people can get them from 2.2...