Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:03:25 +0000 (14:03 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:03:25 +0000 (14:03 +1100)
commit774b54141a3549448b7bbc5bc69a661ac525df48
treef5bc7d1ce96a1734f5b6c6525e8e0ef1cd18a548
parent26108eb66b4b5d4b339dfc845e8a018190068e81
parent361b9f43fb2abb64f2cbae7740b89a616a3c2646
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local