diff --git a/manifest b/manifest
index c29b3a2ba7..87983fadde 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\szero-blobs\sto\sthe\sOP_MakeRecord\sopcode.\r\nFirst\stest\scases\sof\szeroblob\sfunctionality.\s(CVS\s3897)
-D 2007-05-02T13:30:27
+C Fix\san\sinvalid\sUTF8\sencoding\sin\sthe\stests\sfor\sthe\strim\sfunction.\s(CVS\s3898)
+D 2007-05-02T15:36:02
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -238,7 +238,7 @@ F test/fts2k.test 222d0b3bc8667753f18406aaea9906a6098ea016
 F test/fts2l.test 4c53c89ce3919003765ff4fd8d98ecf724d97dd3
 F test/fts2m.test 4b30142ead6f3ed076e880a2a464064c5ad58c51
 F test/fts2n.test a70357e72742681eaebfdbe9007b87ff3b771638
-F test/func.test 8a3bc8e8365dc0053c826923c0f738645f50f2f5
+F test/func.test 6727c7729472ae52b5acd86e802f89aa350ba50f
 F test/hook.test 7e7645fd9a033f79cce8fdff151e32715e7ec50a
 F test/in.test 369cb2aa1eab02296b4ec470732fe8c131260b1d
 F test/incrblob.test 09db22f90137dc4f449cf6c7f8e554156fb68fd2
@@ -471,7 +471,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 93a3bf71d576096f4b5a3db256ca6f9b5521d137
-R fa4803e6928e32943334bc2c675198a5
+P e6d560ddeeb48fb0cbd9f5a10612280b055baef7
+R 15848809be73f4e08f83f1fd795bb746
 U drh
-Z ea8ec33f5bc91d3f655c1cd7ff5d5d75
+Z f28dc40a5ade2da68f7833936614ab80
diff --git a/manifest.uuid b/manifest.uuid
index 4e16b92621..9c1a931978 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6d560ddeeb48fb0cbd9f5a10612280b055baef7
\ No newline at end of file
+4dbbfff4a7d4be197aac19c80400dafe10dd5e58
\ No newline at end of file
diff --git a/test/func.test b/test/func.test
index 0800a8a870..c1389b3535 100644
--- a/test/func.test
+++ b/test/func.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.62 2007/04/27 21:59:53 drh Exp $
+# $Id: func.test,v 1.63 2007/05/02 15:36:02 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -822,11 +822,11 @@ do_test func-22.13 {
   execsql {SELECT trim('  hi  ','');}
 } {{  hi  }}
 do_test func-22.14 {
-  execsql {SELECT hex(trim(x'c280e1bfbff7bfbfbf6869',x'6162e1bfbfc280'))}
-} {F7BFBFBF6869}
+  execsql {SELECT hex(trim(x'c280e1bfbff48fbfbf6869',x'6162e1bfbfc280'))}
+} {F48FBFBF6869}
 do_test func-22.15 {
-  execsql {SELECT hex(trim(x'6869c280e1bfbff7bfbfbf61',
-                           x'6162e1bfbfc280f7bfbfbf'))}
+  execsql {SELECT hex(trim(x'6869c280e1bfbff48fbfbf61',
+                           x'6162e1bfbfc280f48fbfbf'))}
 } {6869}
 do_test func-22.16 {
   execsql {SELECT hex(trim(x'ceb1ceb2ceb3',x'ceb1'));}