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 07:46:48 +0000 (17:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:48 +0000 (17:46 +1000)
commit7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a
tree3b2ee6f9e34e282106bd67f64c13939ab0285664
parent30da1b534f00ba6ef6cf86cba603732bc6e1ad43
parent54b873e49ff363609632fa2862208bf6b4c1b6ed
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet