Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:12:00 +0000 (19:12 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:12:00 +0000 (19:12 +0200)
commitadc84e12865115f15df01676b2040d9e06cafa2c
tree89a45b9c706b25cff55575e7f2760b9424ae5486
parentddfc4380adc46a7c004ebc35da32e491ea39184a
parentc9d7ebcc0e0ed4de6c5252ed005f89fc473f6dc1
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 3cff5bc25ad894bef6ed65566d9d692968092760)