Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Jan 2008 14:43:11 +0000 (15:43 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Jan 2008 14:43:11 +0000 (15:43 +0100)
(This used to be commit ea36c3add588061cf338deabb2d8952f2213a8bd)

1  2 
source3/Makefile.in

Simple merge