Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 17:26:28 +0000 (18:26 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 17:26:28 +0000 (18:26 +0100)
commit5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c
treea4032b21532f29b956b1bd08c3b2647251939d64
parenta19534d2072ca7dc4c70767d02db58503678cfaa
parent98fdbb61260b19bc97675336993f3fcb5f470f90
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)