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 19:29:42 +0000 (21:29 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 19:29:42 +0000 (21:29 +0200)
(This used to be commit cce1659d3382495d84cd086bd105903211c1c1de)

1  2 
source4/build/m4/public.m4

Simple merge