Put back changes that were on samba.org but not in CVS.