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:13:58 +0000 (14:13 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:13:58 +0000 (14:13 +1100)
commita5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521
treebc204af36200a4481d2f9fc158471267d47d4454
parentd08eabdf91cade7f034468811d6228e75c69c1b5
parentfa2eb3447361457557d84ed8afd0757638410584
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 4aff02ecf18d52ae8e64e0c938ac5edf82a6dcef)