Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Thu, 27 Mar 2008 23:59:54 +0000 (00:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 27 Mar 2008 23:59:54 +0000 (00:59 +0100)
(This used to be commit 4e0b94d648e955b950c50d2ac19e17b06ee1f818)

1  2 
source4/Makefile

Simple merge