diff --git a/manifest b/manifest
index e988417b8f..7daace87a9 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Whoops,\sthat\sshouldn't\shave\sbeen\sin\sthe\smerge.\sRemoved\sbuggy\scode.
-D 2010-03-03T17:06:32
+C Fixed\scompiler\swarning\son\sVisual\sStudio.
+D 2010-03-03T17:09:01
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -770,7 +770,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 b01f96b2efb253b900547c64266ce2371c419740
+F tool/lemon.c 6958cb9935be265bf51dbc718ef325e3b77685b6
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -795,24 +795,24 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 89d8f98ea6d4d8bf871e08a8d8d1f0d2fd11aec1
-R c6b977eb6fdb2ec045550f266ed3134a
+P 643728003218c9841425dffb6fe506763859fd37
+R 88162007d47a23ce8840be57770bbe94
 U icculus
-Z 5dde1be8d9e62b2de85f0bc589d7e8ac
+Z 5062e0d6c2809b73b8e0e67b25c9222f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 
-iQIcBAEBAgAGBQJLjpcYAAoJEDDcKcGyC63V7iMQAIzX82/47xYM2iER877CRUQV
-z1B9NQFqrKEWpDVWndqYtTuFVhfnLec1CR6AkGgK+NoVKMrkMl4x+puJ/bT70Giw
-CnYSH/lNgsDsCBYoXRt1Vgv1wCmpINiup+mMme4TiqgRNEcjg6YWd0zGY02aNDWQ
-yVelayskGJPI+davThb43ghVS0RPMJ8Y/bFuI3AgrAo7N3nUAV84NQTzki9bzra8
-is7oD4yVxhhGHtspH1g3UrX9e8QFKHaaGgtYxGevJOlkL0jMmHhlwvPAS24Jne84
-ytCiiQgIDGBOnH7L0Mnmy2aHrb9Hlp6vWZF0O7hEFearRScNrqAkePsd5awBoc9X
-jN26hPKZkrqiRfrZnZhJKhoFuT55NbAqKZC65x9ALWJqQ4uU2LJ7+u7j/gIR16/2
-y1qvhPgVdPd4XqBhvrqeqr8nZ4cIl06zgQGSlIc+2+hjfn5iL2gUxsOM8Qo8mF3t
-RaZk4JKWCwmPFctChNq6qmyZELlhbL80qyf+1x2a/N94t6BjXahG0Vv2qRV39MrW
-m4VQ+fn6T6HGqxpqXF0rs6+QpQodWGaxqjl1LCrleJDbJCXxPS8Qs21Btkx3dGeb
-WC/HZAT/7u2IoGtUyymXTtDHlBEQXT36qHZk0aeDCxS8QHrJqATHYERm7z2eEWG9
-+PDFcjG+UUY/gqtSOdSc
-=Vo5B
+iQIcBAEBAgAGBQJLjpetAAoJEDDcKcGyC63VEzEQAKFGgN98bElxiUheG0Y+nIug
+6LqhN/lZAznL1q4t1TgJdHBtsZnBEtEzz0qmjneq68i2WRqADJAaavoqpgwuaoo8
+U6RhPJMxO/40OUNangbj9dPFZRpkPepGWr3akOGR+0EldIcdoD6j4qRpB33Sz8BK
+lc27s2tXtv3MgOnpYaONkjiOLeGj9K6OQJ6jwQoWMSwLbF2M1iZz6q1PS6teS0qw
+awfNOBpugn3PVES47ePR2+s7/4rzL/AiAlUBmcr9B7MdIO29p5hVktKizx53OYyd
+bueKRyH1KxIOGQdo/VBKJejF1eVcz+XnICwT1rytx46EB0AI6Y/F94SYoJETdkP3
+XXgC5zzVxKVdjlHdqWbdYCKLNIfLQvUH+DJkchOO817YjEKeb36zlyNQePup+qm8
+17jxHYejWiHKvB3/tjHo2WgJasaDjyLhe4h7w2/UBx2rkKtR3W3eta/guljwnQ+C
+GexcgCzxS1QzwNB1F6+Awpu2P2fkN1l4Vmxg5aNGU6br4zntNKgTedDD7tVfUHVW
+L8uPJBH0NCMgWHRKMcWSZvLSEZTY5A5OKgpteoIKHq23bTYNEBnYIsd6Qy7sF4Ez
+3eBwLKqOIzh687Nq2OJ5mzgeuGIlrfTaaek06d3gHCmeCKCUaIwElaz2r1pn+AgT
+8Ht2heYwOrxkQbqQA0Iv
+=gus5
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index e07bce5739..d550c112ea 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-643728003218c9841425dffb6fe506763859fd37
\ No newline at end of file
+83495128c820e963c70d11c3196f81d8cf01f867
\ No newline at end of file
diff --git a/tool/lemon.c b/tool/lemon.c
index 057a883c1f..49db0e64db 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -398,7 +398,7 @@ static int actioncmp(
     rc = ap1->x.rp->index - ap2->x.rp->index;
   }
   if( rc==0 ){
-    rc = ap2 - ap1;
+    rc = (int) (ap2 - ap1);
   }
   return rc;
 }