Merge from HEAD.
authorVolker Lendecke <vlendec@samba.org>
Wed, 19 Mar 2003 18:21:44 +0000 (18:21 +0000)
committerVolker Lendecke <vlendec@samba.org>
Wed, 19 Mar 2003 18:21:44 +0000 (18:21 +0000)
commit9da46eec53f8a7773eeb6ab841e41adc32f39d64
tree5700eed3dd13ed6a3745dfdd2742e1b9692a2a76
parentb3bf451a404fe39bf80b659c7503a382a1cef462
Merge from HEAD.

Volker
(This used to be commit f42032060812e9bf409042c790e71fefb40ff17a)
docs/docbook/manpages/smb.conf.5.sgml
source3/param/loadparm.c
source3/passdb/pdb_ldap.c