Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sun, 3 Feb 2008 22:56:24 +0000 (09:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 3 Feb 2008 22:56:24 +0000 (09:56 +1100)
commitcbca41597e0829ee0b1535b2902696a448373045
treee3162199c03f56f02382c8514c289aa238e605d0
parent3231717e1485c70890c23fbfc3087d970a408815
parentc3008e086b1a87c5f4add2a7d1474c2f9a34bfd2
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 377a7c633d4813c134b91739c507dcefb55c9691)