Merge branch 'v3-2-stable' into my_branch
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (19:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (19:41 +0200)
(This used to be commit 754671b8be0bf73a9e1fe7ff420a1b7a1cd501b7)

1  2 
source3/Makefile.in

Simple merge