Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 13 Aug 2008 00:08:23 +0000 (10:08 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 13 Aug 2008 00:08:23 +0000 (10:08 +1000)
commit0819922a0c7f48c2517d3572f98cd1359749c4ae
tree7908afacf1f16b21358465f732ff6a6bed7e0726
parentce7b1424c711949e6feb0181d3759133b77391ff
parent9246924effd4d0b08ca1ef87e45ad510020df93e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local