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)
commitbfab6ab14bd2ba69fde8bbe32f56f308010c8ea7
tree4edbacab40c67bb5d9d6bebe66a22949349cbf9a
parent8dbeca6e9d06d573adebe8d9c5114b24d8782e43
parent62c91987d902d4dfe27023ff2ec2fb73e602105b
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit ea36c3add588061cf338deabb2d8952f2213a8bd)
source3/Makefile.in