merge from 2.2
authorGerald Carter <jerry@samba.org>
Fri, 21 Dec 2001 20:04:22 +0000 (20:04 +0000)
committerGerald Carter <jerry@samba.org>
Fri, 21 Dec 2001 20:04:22 +0000 (20:04 +0000)
commitca87fe7176a69cdce25154b943ec4bb6118e0b03
treeed4a0d62bed0053d83a694e813b4ff9496320db4
parentfff44cc7009da6db0cc6478e0e239324316b4550
merge from 2.2
(This used to be commit 6697e46183719c894ec115c0fd8a18ad4191b347)
source3/Makefile.in