Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 26 Feb 2008 05:19:57 +0000 (16:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 26 Feb 2008 05:19:57 +0000 (16:19 +1100)
commit864328e6563621a0b4df2d49e04ff3b23b68e1ca
tree01b5af0b454d7235b5118ae53d078429dca26619
parent2c8415f767ca20fe90a97f8623d1617e015f183a
parent1e5ced379361fbdc0ccc48ad012f388f2e737ca7
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 35f7f488d84e3ec3224f3b40ff5881e91c11764d)