More merge fixes
authorptools <ptools>
Tue, 15 Jun 2004 08:10:50 +0000 (08:10 +0000)
committerptools <ptools>
Tue, 15 Jun 2004 08:10:50 +0000 (08:10 +0000)
commitf75038534fc3487c01c2c878fe32d66c5bef442f
treeeb3ac7dad3931c826e23b861cb73dca7862b6257
parent048a7a8addb8f4a34be74cd5f4c69c7ffe9aed15
More merge fixes
This test was missing from the origional merge
aclocal.m4
src/Makefile