From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 17:26:28 +0000 (+0100)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

	source/Makefile
	source/rules.mk
(This used to be commit fc9b9853124c8d172172f88e1e4939db5970df25)
---

5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c