diff --git a/Makefile.in b/Makefile.in
index 49741940df..5d2c1d95b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -748,7 +748,7 @@ tclsqlite-shell.lo:	$(TOP)/src/tclsqlite.c $(HDR)
 	$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
 
 tclsqlite-stubs.lo:	$(TOP)/src/tclsqlite.c $(HDR)
-	$(LTCOMPILE) -DTCL_USE_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
+	$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
 
 tclsqlite3$(TEXE):	tclsqlite-shell.lo libsqlite3.la
 	$(LTLINK) -o $@ tclsqlite-shell.lo \
diff --git a/manifest b/manifest
index 8e4f454a0c..fc7ea54348 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Modify\sthe\scode\sfor\sreading\shot-journal\sfiles\sso\sthat\sit\scan\shandle\sjournals\sgenerated\sby\sversions\s3.5.7\sand\searlier.
-D 2010-08-19T15:11:34
+C Merge\stwo\sleaves.
+D 2010-08-19T15:12:55
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
+F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@ -113,7 +113,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 51d83300fe0baee39405c416ceb19a58ed30a8ed
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
-F src/btree.c 3089d018fd27082952d79543e771f6bc8af0b0f7
+F src/btree.c 69942b33b4ed4e0cc9a36b18a288839293528267
 F src/btree.h b4ba2fdf6b64c7c376bdfffa826af6b786b151d9
 F src/btreeInt.h 5b034ff54800046cc5870605d683ac1f9134bd99
 F src/build.c 0018d49629fc4807100c988dd191dd95e185bb38
@@ -845,7 +845,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8804f4989d157707911488781109ce0641c0ad0b
-R 8a8db0863e0d33ddc8ea68f9c11cd0ea
+P b9170f2903c480bca2bdc986e98aaeadfdb9ad2b 4c7ad73d22b7e8c90955730c2dbb79ed53cd750b
+R 26a0e08eb568545db964da4fcb9b01de
 U dan
-Z 9fa359ca155f08d9a7ed0d63491f2a4b
+Z 9d459a63353ebad2047baf5fad1d4c83
diff --git a/manifest.uuid b/manifest.uuid
index 8ea764cbed..923cfcff00 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9170f2903c480bca2bdc986e98aaeadfdb9ad2b
\ No newline at end of file
+b03091fc3592896fcf1ec563ae9682a8e0a05baa
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 7a41057120..f6110a9110 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5560,7 +5560,7 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
   assert( pPage->nOverflow==1 );
 
   /* This error condition is now caught prior to reaching this function */
-  if( NEVER(pPage->nCell<=0) ) return SQLITE_CORRUPT_BKPT;
+  if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
 
   /* Allocate a new page. This page will become the right-sibling of 
   ** pPage. Make the parent page writable, so that the new divider cell