r5283: Merge -r5279 and-r5280 from trunk.
commit74d872287b5cf5b13512091827a9d065f1fef122
authorTim Potter <tpot@samba.org>
Tue, 8 Feb 2005 23:17:44 +0000 (8 23:17 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 15:55:36 +0000 (10 10:55 -0500)
tree9cb7f56723efd4985f2784ef79270173343ed7ea
parentdd55ef25d1b24401a743d0367544e535cd17815c
r5283: Merge -r5279 and-r5280 from trunk.
source/python/py_smb.c
source/python/py_spoolss.h
source/python/py_spoolss_drivers.c
source/python/py_spoolss_drivers_conv.c