Date: Saturday May 13, 2000 @ 10:53 Author: jra Update of /data/cvs/samba/source/include In directory samba:/tmp/cvs-serv13340/include Modified Files: Tag: SAMBA_2_0 proto.h Log Message: More merge - getting closer to a full compile. Jeremy.