merge from 2.2
authorGerald Carter <jerry@samba.org>
Thu, 31 May 2001 17:28:40 +0000 (17:28 +0000)
committerGerald Carter <jerry@samba.org>
Thu, 31 May 2001 17:28:40 +0000 (17:28 +0000)
commit7a33f253e15a0907b22eb03a3a2c79e9998aa1ec
treee617b1dda8d25f4d8410fd7584b9814b0cdff83b
parent0b1f72eda3daf8c9a3a77930b646bd6d29a27fbf
merge from 2.2
(This used to be commit 7e23ed48908cf396610d26efda9f54d5f5f0e83c)
source3/libsmb/cli_spoolss.c
source3/rpcclient/cmd_spoolss.c