Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 18:44:59 +0000 (20:44 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 18:44:59 +0000 (20:44 +0200)
(This used to be commit cca75ae22d225dda2e96907daa3c24a35bb281cd)

1  2 
source4/build/m4/public.m4

Simple merge