Merge branch 'v4-0-trivial' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Sat, 16 Feb 2008 15:33:13 +0000 (16:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 16 Feb 2008 15:33:13 +0000 (16:33 +0100)
(This used to be commit 8e716d139003d3e743dd99d93f76da4cfa7d48b3)

1  2 
source4/build/smb_build/makefile.pm

Simple merge