Merge with latest trunk fix.

FossilOrigin-Name: a8910e89dee326d7788b29e77820eb1e114739ca

diff --cc manifest
index d497725beb62aab56fab99ba7be76f1eb44db9a2,0898bf1ca555f6823dd2e5f81541361f66459c06..de24bf1209edf3bfd18e585fd49408593f3992d0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\swith\slatest\strunk\schanges.
- D 2010-11-18T16:32:54
 -C Ensure\stcl\sis\susing\sutf-8\sas\sthe\ssystem\sencoding\swhen\srunning\scapi3e.test.
 -D 2010-11-18T16:58:49
++C Merge\swith\slatest\strunk\sfix.
++D 2010-11-18T16:59:24
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -888,7 -887,7 +888,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P ae089ec881beb1c2d278303ba964aaeffad1afe4 c36f275d70ec8f6dead6adac02885026fdff9666
- R dda1122b35baa4cce662182aeeace1c2
 -P c36f275d70ec8f6dead6adac02885026fdff9666
 -R 94e5b29a1e7d3e1ce1116e4aa76418d2
++P e376480f0855c598c91529abacbd73e31d9f4713 0a95589f2166f9ce420e647b73e8c797fe8f4833
++R 87db3bd5bf4a3735ef4309e5d5955901
  U dan
- Z ba40359d70663cc285a38d5d7d7027de
 -Z 48483be6d4c72d388a7a44154f6792c7
++Z 9fccaf5d4045282a697f1275247ad8b5

diff --cc manifest.uuid
index dba8fdc8407e470dd21975412cba8e72267a29b7,328c38d9f38e93df90dd433c55ffd93b73a8c094..b70e7c96b679cf281ea18e911e0470c9849ceda1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e376480f0855c598c91529abacbd73e31d9f4713
 -0a95589f2166f9ce420e647b73e8c797fe8f4833
++a8910e89dee326d7788b29e77820eb1e114739ca