Merge branch 'v4-0-trivial' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 12:33:35 +0000 (13:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 12:33:35 +0000 (13:33 +0100)
commit1131d4c2545355ef793e468810655c0f72828368
tree6812d6bfd27835a9992e4addb98329da6c087d22
parent94c937ffb0109effa55117c525db941194893091
parent5e336bea1c68fafa97f67abf89c678d3cd7250b8
Merge branch 'v4-0-trivial' into v4-0-gmake3

Conflicts:

source/build/smb_build/makefile.pm
(This used to be commit 4d190270463f8db475c152f5502c9de01765d904)
source4/build/smb_build/input.pm
source4/build/smb_build/main.pl