Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 23:59:14 +0000 (10:59 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 23:59:14 +0000 (10:59 +1100)
commit9cc90f67b3fc4a16a2029a1cb1d98286ae598966
tree7d579b4a7b377035907ae1fc3206d5f2573303ff
parentc16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67
parent87e933d886daa2abc30761e307be35170bbb6aeb
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 81a0a7967b8f659f1f35a7a25de469725417ab43)