Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 27 Jun 2008 02:03:23 +0000 (12:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 27 Jun 2008 02:03:23 +0000 (12:03 +1000)
commit9607e79c3db9743617397c347bb69f87f6525801
tree9bb62c7fd69b57df783196d3758b1595da512b6f
parentedd9ecce9511871d9c9942d50eb91c68a8e04ec9
parent97b724417fc8110f7c591779b0c17bd072be304f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local