Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 6 Feb 2008 05:14:09 +0000 (16:14 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 6 Feb 2008 05:14:09 +0000 (16:14 +1100)
commit594ff923295c7420167aa899ec6030de07038625
tree7e7cfd2651eacdfd71e83f15fece09017c491bec
parent07590d893e993919cf6cb7582310777f534e756f
parent16466b543bf8dd35bc79a030696f78598ca82f54
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet