Actually fix the merge.
authorJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:50:39 +0000 (12:50 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:50:39 +0000 (12:50 -0800)
commitb775fe0a170f9b6043aaea2c025fd70528c7e7e8
treee241de12184e32f54256c0b3cdfd26600e8973e8
parent03d3009986b3c82b55723e6db21e386a6bcedee8
Actually fix the merge.
Jeremy.
(This used to be commit c855de0c05e2e271e2610de67a6d7e3aba52390f)
source3/Makefile.in