Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commite8da1559f7282127264c671c485e812f669b97ba
authorAndrew Bartlett <abartlet@samba.org>
Fri, 18 Apr 2008 16:21:52 +0000 (18 18:21 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 18 Apr 2008 16:21:52 +0000 (18 18:21 +0200)
tree5b391eadcdade35c110695280ebd73d0ed143686
parentfa459913039673e55aa9300962f01e5079dd20d8
parent3c217518ba9a7b64fe6c842187499f1ee5189567
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet