Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commitedd9ecce9511871d9c9942d50eb91c68a8e04ec9
authorAndrew Bartlett <abartlet@samba.org>
Fri, 20 Jun 2008 09:04:14 +0000 (20 19:04 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 20 Jun 2008 09:04:14 +0000 (20 19:04 +1000)
tree5640d6d9fb1e8b0d0ee7afd82649ac20347a6ef6
parent5fcb39594b07c7b7a11985711a912b7a4d629ae7
parent87385e4c873f80956dc1c43424dd4f49a993586c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local