Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 16 Jan 2008 23:32:41 +0000 (10:32 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 16 Jan 2008 23:32:41 +0000 (10:32 +1100)
commit11660b0737107138b53c3a08e8de30ee44607eae
treeb5fa77f7392815a278708dfc8d0b960ece465392
parentee93b4e2ee1dd1cd38bcf14b2bb62556a13cec4a
parent95872d7db8c9bb1914ab4c9860fd8b09e6695cc7
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local