Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Tue, 10 Jun 2008 13:05:41 +0000 (15:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 10 Jun 2008 13:05:41 +0000 (15:05 +0200)
(This used to be commit 74e1dd28f2f669bc196dc16b68c8b175bf835721)

1  2 
source4/configure.ac

Simple merge