Merge commit 'origin/v3-2-stable' into v3-2-ctdb build_3.2.0_ctdb.36
authorMichael Adam <obnox@samba.org>
Wed, 9 Jul 2008 13:07:32 +0000 (15:07 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 9 Jul 2008 13:07:32 +0000 (15:07 +0200)
commitab06803c62dc963a8485ae80e8f01859a6de0eab
tree09211a8607007cca8b710caffc72bd07c9e7f2dc
parentf3bca2683483df779c4be9530ba7c270b77e1d1a
parentddb3d012647c9ae0e5f7a9ada4219c934839d5a5
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
source/param/loadparm.c
source/smbd/posix_acls.c
source/winbindd/winbindd.c