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)
commit35f7f488d84e3ec3224f3b40ff5881e91c11764d
treeb099265f119a0efbde421f479de51898475c3339
parent98461d6053b9ad98a372ec59ded2c7eaade99640
parentbb1107118951aa37c69b053f5cae624706966f1e
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local