This commit was generated by cvs2svn to compensate for changes in r4,
authorSamba Release Account <samba-bugs@samba.org>
Sat, 4 May 1996 07:50:46 +0000 (07:50 +0000)
committerSamba Release Account <samba-bugs@samba.org>
Sat, 4 May 1996 07:50:46 +0000 (07:50 +0000)
which included commits to RCS files with non-trunk default branches.
(This used to be commit c8a46aca039f16b00bcd177ac2bb9962fdfff529)


Trivial merge