Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 20 Jun 2008 09:04:14 +0000 (19:04 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 20 Jun 2008 09:04:14 +0000 (19:04 +1000)
commit1e36856ae50762ebad2d16e81b7ad604509b0d52
tree3a3fad642b1fa17617d6370a208e96915326690b
parent08656f831ce1fc149b141b10b0eb04a33e16eb95
parent2d65e5a60d6ff7648ef71535f1018390aefe194e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit edd9ecce9511871d9c9942d50eb91c68a8e04ec9)