Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 19 May 2008 22:03:35 +0000 (08:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 19 May 2008 22:03:35 +0000 (08:03 +1000)
commit343fea32ccd205c68b23ee894a8ab4f9413af746
tree692412a9e06c8947a84aef39d3def68d74774c13
parent38c68f1d5bf972f2473a41bf15c4a54efdc38b7e
parentd817b435342956295f0a31b91203d1a63ae12063
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

Fix config.mk due to changing syntax.

Conflicts:

source/libcli/config.mk
source/nbt_server/config.mk
(This used to be commit 6a1c76f29f78183f44dfac6f468c5e728d2cb2cf)
source4/auth/ntlm/pam_errors.h
source4/libcli/config.mk
source4/librpc/config.mk
source4/nbt_server/config.mk