diff --git a/manifest b/manifest
index b7889cb1e1..c32eec87bf 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Corrected\serror\smessage\s(cut-and-paste\sbug).
-D 2010-02-17T20:19:51
+C Fixed\s%\sformatting\sin\ssome\sprintf-style\sstrings.
+D 2010-02-17T20:22:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -765,7 +765,7 @@ F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
-F tool/lemon.c 8e89d9fe40154a80dac45f3c62c7d3d3756cfe60
+F tool/lemon.c ec4def6e8b6335d8ac0efbaf3f4b4cdb2c2cb51d
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -790,24 +790,24 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ca570a02f5c5215098050de4eb551b2dcd11b1fd
-R af2163f880697a278e782e0b45f6bbf3
+P b3839f2aad00844c578d496c40481a39c018e4f6
+R 8568b6894a9a02964b44ffe7906bbf0d
 U icculus
-Z 214193d682b8654642ade10797335cf0
+Z 88030a276c2ac0e676ff13eba4b7144a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 
-iQIcBAEBAgAGBQJLfE9sAAoJEDDcKcGyC63VBlMP/A4dFxtjc2Tjq997rr4v0Z5V
-Fscv8xttUUkJ8NIGnTOocrJi+WxR8T3qQSJgjxngXA80WsxDi2nELRep30KGWgdt
-3+j7wsgMTEEMQ3c1Vmrmt/0ZJSTDJg+RRZwf5PaLl+sVlVsFEv1E1IiKPrfjIDZw
-xy4yOZKLFXI5B4mgMU0Ut4gSi+jK5ZwJe6fL+3D13ucQKznw6QFpM72L/Q2gT0FD
-5weUesD25CpcCX00FiggHXpoOQMlgBayO1RTlQFEuF1D7olMugl8BJzQ32uRAnqT
-nnuVmB46cYQBeMyRJYUbnALW8XCvCuKhFCDMB0/K6U6RnCPY8w8kt+KoptHI62Ia
-JkXAO7kh9+wGLeYE6P+i5WFPdPP2OubFI7v/B58uLN2uEknegbmgDDZk9GlHUbyF
-mPJ71q5ENSm475OCNj/ljIqzp/uqxpc6Y5CCnP73vqaumFDXSDF4jtPO0qiKwuI7
-/Mbw1cdpOlQrNqkZvpyAWWWT2aXKcpyWi0ANpSqDstpOVhApEj3A863pjv4pqcKf
-mMxmOLwI7DyYQCTX3GEbDxvLj3ovwgS+hJLmMD0My6/D5LYgCT+L7wH6B8mje3lJ
-v/BuBvkYkchGDb4sYreUPbpobTCddX8jKIOjfqsbhZvKUzYVrTOiPdOy6+1pWOg0
-19/M2JgXFC1d53JZ28Fw
-=M3pu
+iQIcBAEBAgAGBQJLfE/4AAoJEDDcKcGyC63VAb0P/ipsm+CwkLui/+x6twceYVUJ
+NLhI1ujYZveXDrmu24pCzQ70Jw67I4wc5niUyIv4I2uMTx+vAwNlUd5p/v5K2Zcq
+ffT/1CQutGyY7fj4IlAqL0yMp1JLO5rN4iRBgMlrnlAA7Q2XkGe9NviPHoS4N2uS
+OUbJFq2wxX+4XQs0e5ATkzBP85k+gljRoH5MXv7oYVSa7LHGgQVx4Zt/+SY0HBFK
+CKVTEUblNkaD+MgKIN4Rd57LwzMw2SMcezJhPd3uLws65L4JPs9sVp8cWoe5WXgV
+Yc2hYWMI7CheoJpLEv/I3SKdE0b5DwFGAFCstZAGJBOBdby8MCyS7zUmZc43oh2U
+KNuequz8boXX3vdBmkbnpiETDrC9t2jKFfvN4bkB/k2fhhkBZ2kUY+i1MhrD9JZs
+nChNxJgEhfUDT9bLfWwGky6oNl6Wkqxqb5/AQUi53eqqTAIQvc+wV01PnMfrpRvL
+1Qrani0DtnpE1CujJUvy/dhha9Aza8FQJL1kWD2JdT2KAcLfsTc99abXgxkVZsfC
+yeB4WqSmwu5liScsxA+JE7Gj4jk+bBZKHle0XtoMp8mXZZjc82prLeeiwPYP8Mxp
+U8RzdQiAb4F5zfp3XRO8JG3UwwSTvFjaQZwTH0TDy18rXAqCEqbfenGcySNSB17q
++wUAhlfLAxDu/xK+m7Zv
+=R63k
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 9a9e709cce..93e1abb866 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3839f2aad00844c578d496c40481a39c018e4f6
\ No newline at end of file
+f96add898f096cfc1e435c625ce74093d790b3c7
\ No newline at end of file
diff --git a/tool/lemon.c b/tool/lemon.c
index 49f3f31e5f..d7e45308f7 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -2281,7 +2281,7 @@ to follow the previous rule.");
     case WAITING_FOR_DESTRUCTOR_SYMBOL:
       if( !isalpha(x[0]) ){
         ErrorMsg(psp->filename,psp->tokenlineno,
-          "Symbol name missing after %destructor keyword");
+          "Symbol name missing after %%destructor keyword");
         psp->errorcnt++;
         psp->state = RESYNC_AFTER_DECL_ERROR;
       }else{
@@ -2295,7 +2295,7 @@ to follow the previous rule.");
     case WAITING_FOR_DATATYPE_SYMBOL:
       if( !isalpha(x[0]) ){
         ErrorMsg(psp->filename,psp->tokenlineno,
-          "Symbol name missing after %type keyword");
+          "Symbol name missing after %%type keyword");
         psp->errorcnt++;
         psp->state = RESYNC_AFTER_DECL_ERROR;
       }else{