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)
commitc855de0c05e2e271e2610de67a6d7e3aba52390f
treea9bf4ddd738c40f877d2522d17cd997fefc344d4
parent351df194a927371600824f4c03d8a24b95fbef64
Actually fix the merge.
Jeremy.
source/Makefile.in