Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 13 Mar 2008 22:59:24 +0000 (09:59 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 13 Mar 2008 22:59:24 +0000 (09:59 +1100)
commitbd614d28d48a187adcafffd301b0f70c154f4d38
tree9aee052f705317925073752ea68cfc8cf434984a
parent80f7e9e08176592ad161a0707244ad9b52e964bd
parent7db5e0a601968b9a5a978abd5a5a21b33913baf1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit d50b76ed71ab6bc8e63926540638df5af10202ae)