merging from 3.0
commit52be5d83191a46151511531824d1d12c1615808d
authorGerald Carter <jerry@samba.org>
Tue, 2 Mar 2004 04:19:47 +0000 (2 04:19 +0000)
committerGerald Carter <jerry@samba.org>
Tue, 2 Mar 2004 04:19:47 +0000 (2 04:19 +0000)
tree0d8b3956f4c92bbf35374c1d881283be1bd67b07
parentfcab2e5cfb524afa327fbafa2915c73527f14ea6
merging from 3.0
(This used to be commit fae17e0f9d228bab9992287507babd6a8fd53f97)
source3/client/client.c
source3/param/loadparm.c