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)
commit6a1c76f29f78183f44dfac6f468c5e728d2cb2cf
treeeb5104b534dce12c57287b5aaafaa0121f52c6c9
parenta8ec36eba79f96940f314520f97d23181bc9cfc5
parent49b04ca7aadf264e500d83bc8d3cb5173a86184e
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
source/auth/ntlm/pam_errors.h
source/libcli/config.mk
source/librpc/config.mk
source/nbt_server/config.mk