Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 05:39:03 +0000 (16:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 05:39:03 +0000 (16:39 +1100)
commitc16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67
tree8efaf6b885543a006a91294923324fc580d01bbf
parent11061499e182b9c41ec793d4eefb8a2cf7c88bfe
parentcab677a33f0376cd1bf96ec561dc0463bbf80edd
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)