Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 18 Apr 2008 16:21:52 +0000 (18:21 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 18 Apr 2008 16:21:52 +0000 (18:21 +0200)
commit0321bc02598087685c6ea144e3920a64ab909b83
tree01fa776e99c876a7e6a7a94285db90e844cd8b08
parentbfbcfc41f55c7a428ee89f67d739bb3d1028507d
parent93c9de03afd907015108bbb53bd8453da3cc8115
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit e8da1559f7282127264c671c485e812f669b97ba)