From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 18 Sep 2008 18:29:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
X-Git-Tag: samba-4.0.0alpha6~769^2~260^2~106
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=729ffbae086309992d7433a296fca64f6800f8fa

Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

Conflicts:
	source4/main.mk
---

729ffbae086309992d7433a296fca64f6800f8fa
diff --cc source4/main.mk
index ea410bd0556,ddeb4baf2ec..0edfa1c1441
--- a/source4/main.mk
+++ b/source4/main.mk
@@@ -16,8 -16,9 +16,8 @@@ mkinclude lib/registry/config.m
  mkinclude lib/messaging/config.mk
  mkinclude lib/events/config.mk
  mkinclude lib/cmdline/config.mk
- mkinclude lib/socket_wrapper/config.mk
- mkinclude lib/nss_wrapper/config.mk
+ mkinclude ../lib/socket_wrapper/config.mk
+ mkinclude ../lib/nss_wrapper/config.mk
 -mkinclude lib/appweb/config.mk
  mkinclude lib/stream/config.mk
  mkinclude lib/util/config.mk
  mkinclude lib/tdr/config.mk