diff --git a/main.mk b/main.mk
index 1fc86c837b..60df83514d 100644
--- a/main.mk
+++ b/main.mk
@@ -116,7 +116,6 @@ TESTSRC = \
   $(TOP)/src/btree.c \
   $(TOP)/src/func.c \
   $(TOP)/src/os_mac.c \
-  $(TOP)/src/os_test.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/os_test.c \
diff --git a/manifest b/manifest
index 3a2297ba6e..cb9e121a8b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\ssegfaults\sthat\scould\shave\soccurred\safter\sa\smalloc()\sfailure.\s(CVS\s1661)
-D 2004-06-22T13:22:40
+C Fix\serror\sintroduced\sduring\smerge\sof\smain.mk.\s(CVS\s1662)
+D 2004-06-22T13:23:47
 F Makefile.in 0a3d7aaefa50717bd550b0cf568a51072c4c103c
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -17,7 +17,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk ed07aaa719ccc4fdb2d86b2d8079bbd4faba7ce5
+F main.mk 5dbdfd52ee306c553c88278d7dc4adb58a662209
 F mkdll.sh 68d34a961a1fdfa15ef27fc4f4740be583112124
 F publish.sh 5bc5e493fa1773a3c0d9712182de0f5abd494903
 F spec.template a38492f1c1dd349fc24cb0565e08afc53045304b
@@ -228,7 +228,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl af528563442e3039928f9018327a18157e53a44f
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 64a6d805178af8947ccca19898c06979c226d92b
-R 8a2991bd99cf63f67057ae040d7bd05a
-U drh
-Z 77d0fbc0eeda0f21673a68ba50db4d18
+P 80151e728101c3cd5a8cf36cca2bfa661b21c746
+R f4f8b0a0e751eed0da6a164979ec2da0
+U danielk1977
+Z c0120d3009da903dfa531b7977038fc8
diff --git a/manifest.uuid b/manifest.uuid
index a09be2f344..e941a222e6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80151e728101c3cd5a8cf36cca2bfa661b21c746
\ No newline at end of file
+eef6da38d5b1d84e8a1eb9fe88f0f568717ea323
\ No newline at end of file