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)
commit5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098
treeafc885ed00776acfc6b4f592c2a7eba4b763d2ef
parent142fbfb3c1f9f8cda7f0edaa801f8345f23d805f
parent52013b846a7b97022b8368b51734e7a960e704f4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 764b7879d23bfa413a6747226f377ce2eaeaea26)