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)
commitfa2eb3447361457557d84ed8afd0757638410584
treeff303a0f8dacafd1a4619d0a2d30b0395685d894
parent19fcdb2e8ad2be30903d694eb2b76a08db54a205
parent4932e4bb7ad11c6ef8ad3187063dba4e7481afa7
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 774b54141a3549448b7bbc5bc69a661ac525df48)