Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 11:04:52 +0000 (22:04 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 11:04:52 +0000 (22:04 +1100)
commit764b7879d23bfa413a6747226f377ce2eaeaea26
tree83185e4c12e15cc71a9e105384a6705d3267f110
parent727ef40c2b56910028ef3c1092b8eab1bfa6ce63
parent326ae6ce9c8a6f5800d5ecb4a2bfdfc32336797d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local