Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 1 May 2008 06:41:36 +0000 (16:41 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 1 May 2008 06:41:36 +0000 (16:41 +1000)
commit30a45df36612bc4b9aaae07031fc9486d8fe6a7c
tree07790cdb45218c7a8d1d99d00b73d1e6c2834978
parent7c5704499a9881493f8bdfcefb095b50ab072a02
parentaedaba990f02fd1f613c1830d3774843cf8d5f0d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 6bb4c1e6a38a842787177a399bf88f05015f5ec0)