Merge latest trunk changes with fts3-changes branch.

FossilOrigin-Name: 226686475c28cdc87e86d2d3f10014436a9a2b8f

diff --cc ext/fts3/fts3Int.h
Simple merge

diff --cc manifest
index 5cd1fbd7ca7a496ca3ca71bb1826de5de399f5bd,52cfcaf6e7eeaabb0acb8cd936d4ecb3ebf4f36e..57c9073015d1493a8bc29f703e817695463174a1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges.
- D 2011-06-27T19:25:10.603
 -C Changes\sto\sallow\sFTS\sto\sbe\scompiled\sas\sa\sloadable\smodule\sagain.
 -D 2011-06-28T07:15:43.990
++C Merge\slatest\strunk\schanges\swith\sfts3-changes\sbranch.
++D 2011-06-28T09:51:22.803
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -62,12 -62,12 +62,12 @@@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 -F ext/fts3/fts3.c ca776037493d0081da70a6afc0df80f5ce347cb7
 +F ext/fts3/fts3.c 70127bf57c54c45545a4ddd73161caf2d9bd1abe
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
- F ext/fts3/fts3Int.h 7b452eeb592134c7adf87720c9e56d6060d1ed5a
 -F ext/fts3/fts3Int.h 61c90f512b563345f9aa99c48c7afd0928de055c
++F ext/fts3/fts3Int.h e670e2c58b3dca76e44f7e7d35e61113d079db58
  F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691
  F ext/fts3/fts3_expr.c 23791de01b3a5d313d76e02befd2601d4096bc2b
- F ext/fts3/fts3_hash.c aad95afa01cf2a5ffaa448e4b0ab043880cd1efb
+ F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
  F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
  F ext/fts3/fts3_icu.c 6c8f395cdf9e1e3afa7fadb7e523dbbf381c6dfa
  F ext/fts3/fts3_porter.c 8d946908f4812c005d3d33fcbe78418b1f4eb70c
@@@ -949,7 -949,7 +949,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 25e5b7686a06e7f4ee993d8559d23143e2e8c7a8 d9f7993bfa2ecb30c44455de538eb6f8a4a59087
- R d90c56f8c8c73b3d354275ed6655034c
 -P 6c871ac1fa3c79baa0053dc49ab106cb3db4cfa0
 -R 4e5d4c059d7e31bcf35d2d245a2997b7
++P 11ea98e454ad35b2606e81dec9ac866e4dd9f7e1 29e69f389cb0078e125ba5814a68b3fe8cf634c6
++R 99f54668f5b612c34e36e4280019aae3
  U dan
- Z 93900890f23a5f1f420e0f052b3cd95b
 -Z c2844ce2a2f8548d3356adfa633cbd5b
++Z c4e55cbac13868c8cb421abab69674f2

diff --cc manifest.uuid
index 024ad843d7401a5ba5246563b6a21b7ff61517f3,b82e4229ca1aca87660ec68af6bd25f58c94efbc..8ca57f2fa73db3462d60a8a423eddcbebb093941
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 11ea98e454ad35b2606e81dec9ac866e4dd9f7e1
 -29e69f389cb0078e125ba5814a68b3fe8cf634c6
++226686475c28cdc87e86d2d3f10014436a9a2b8f