Merge commit 'origin/v3-2-test' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Fri, 6 Feb 2009 15:51:28 +0000 (16:51 +0100)
committerMichael Adam <obnox@samba.org>
Fri, 6 Feb 2009 15:51:28 +0000 (16:51 +0100)
commitc860c4a688bb66dbe6916a365d340a94601ea416
tree7657efec45a88f2e4c6abf60eb769bc6c66d8bed
parent8f9b7c41c8a8632467db52eb7fa3f2f6e46c2f2e
parentc86c2219b23fb2e5ce652dae18b0299d76dcb524
Merge commit 'origin/v3-2-test' into v3-2-ctdb
source/libnet/libnet_join.c
source/modules/vfs_default.c
source/smbd/posix_acls.c