merge from 2.2
authorGerald Carter <jerry@samba.org>
Mon, 13 Aug 2001 21:30:27 +0000 (21:30 +0000)
committerGerald Carter <jerry@samba.org>
Mon, 13 Aug 2001 21:30:27 +0000 (21:30 +0000)
commit7049217eb40dbe3de6c05fe43742d2f684501723
tree5b706eebeabb6ba8871ceb64c7b1fadd5dbd1412
parentbefbfea21035b0566fc6ba8674587fc44ad7bbdc
merge from 2.2
source/param/loadparm.c
source/rpc_server/srv_spoolss_nt.c