Merge commit 'origin/v3-2-test' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Tue, 3 Feb 2009 15:53:57 +0000 (16:53 +0100)
committerMichael Adam <obnox@samba.org>
Tue, 3 Feb 2009 15:53:57 +0000 (16:53 +0100)
commit8f9b7c41c8a8632467db52eb7fa3f2f6e46c2f2e
tree3f932f9ddc68a8c0e54b116111cd23bb1b35ec96
parenta9a506b6640986548e2ae8540b7ae93960d6ece5
parentc415b6a48dae2809d5d60b0af23eb7781f1146db
Merge commit 'origin/v3-2-test' into v3-2-ctdb
source/Makefile.in
source/VERSION
source/configure.in
source/modules/nfs4_acls.c
source/smbd/posix_acls.c