merge from 2.2
commit062bba07f2faedfce7612c8b4a16072fa200349e
authorGerald Carter <jerry@samba.org>
Thu, 11 Oct 2001 16:44:17 +0000 (11 16:44 +0000)
committerGerald Carter <jerry@samba.org>
Thu, 11 Oct 2001 16:44:17 +0000 (11 16:44 +0000)
treee79b256a8257c2d74192c7ad5cd22f192a6d0e1c
parent8b692d8326a1548a7dbbd2cecee9ece6aa60473a
merge from 2.2
source/param/loadparm.c
source/smbd/ssl.c