Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 23:47:18 +0000 (09:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 23:47:18 +0000 (09:47 +1000)
commitcd261ee651d3059f6973464115ff43da71d8a595
treefd7af08735a52699043e183cc97f8e1163487a40
parent3bd2a50bab2fdb1e25f61d625b920bac016a261b
parent8c0fbbf6e927db9fdbffc28fcde0bea97c5e60e6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit e85abe7db21eec47adecae8243a25f145aa7ec9a)