Merge trunk changes.

FossilOrigin-Name: 90df64ab803001819b3ebbb41d596aedbd9961b1

diff --cc manifest
index c081ba92f0670c3c6bdbaeee9016c23a3d9d01db,ba543738451eabe08fe34aeea4813d0204b297d1..010cecc7bb996efe466246a4293a28b7ce085873
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s"matchlen"\scolumn\sto\sthe\sspellfix1\svirtual\stable.
- D 2012-07-13T19:26:34.617
 -C If\sa\sspecific\sdatabase\sis\snominated\sas\spart\sof\sa\s"PRAGMA\sintegrity_check"\sor\s"PRAGMA\squick_check"\scommand,\ssearch\sfor\sproblems\sin\sthe\snominated\sdatabase\sonly.\si.e.\s"PRAGMA\smain.quick_check"\snow\sonly\sscans\sthe\smain\sdatabase,\snot\sall\sattached\sdatabases\sas\sbefore.
 -D 2012-07-16T10:06:12.788
++C Merge\strunk\schanges.
++D 2012-07-16T10:25:54.662
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1005,10 -1004,7 +1005,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
--P cba2a65870481df213e006b07e74f0ca19d2d57c
- R 79ffd07a9c878240f73dd72d96e3ef36
- T *branch * spellfix-matchlen
- T *sym-spellfix-matchlen *
- T -sym-trunk *
 -R 2c8947c00bca721d7703f91176d94433
++P f24b9d87f6b0e8b4d26669d5c1191f9280ba14a3 4353e40b74f577f224f190c429bfe03cf6a5c6d6
++R 41982e9e09fbd84544b16a8024815a54
  U dan
- Z 642149d4a86bbb287ab54c68c79dc818
 -Z f57f4dc603e6879ace3edbe2fb8156d2
++Z df39f17a0a50d7df733c6d4551aaf8e2

diff --cc manifest.uuid
index ebe0ec24580f35bb0d7c021e1335d92963ad9858,c37c8336d7fd6c91e867f047d2e6231cecc255b5..e3850d5fefdc4551c3fb6a8cf0b0acdfa67eb7a0
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f24b9d87f6b0e8b4d26669d5c1191f9280ba14a3
 -4353e40b74f577f224f190c429bfe03cf6a5c6d6
++90df64ab803001819b3ebbb41d596aedbd9961b1