Merge the fts4-languageid branch with the trunk.

FossilOrigin-Name: 99a9073b5e411ce94f38ce49608baaa15de8b850

diff --cc ext/fts3/fts3.c
Simple merge

diff --cc manifest
index 3d02667f89eb5b2c19df4487ad87defcd1020b88,ef077935d3bb1977b77179827ab5417ac40e1e1c..258b28d30245176721faff0fabb899fa576b40b8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\stest\scase\sfor\sticket\s[3557ad65a076c].
- D 2012-03-03T01:44:12.761
 -C Add\sthe\sxLanguageid\smethod\sto\ssqlite3_fts3_tokenizer\sversions\s1\sand\sgreater.
 -D 2012-03-03T18:46:41.456
++C Merge\sthe\sfts4-languageid\sbranch\swith\sthe\strunk.
++D 2012-03-05T15:33:32.751
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -63,11 -63,11 +63,11 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 96ae9e273a770e2c249117360ec68e38aa0b13fa
 -F ext/fts3/fts3.c fcda9a9ff7ccfb9fe4388d36063e3405a652e15f
++F ext/fts3/fts3.c 806632fd0020eed966ab82ea25fe09f1a4c86907
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
- F ext/fts3/fts3Int.h ce958a6fa92a95462853aa3acc0b69bcda39102f
- F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691
- F ext/fts3/fts3_expr.c f5df26bddf46a5916b2a5f80c4027996e92b7b15
+ F ext/fts3/fts3Int.h d1d7f964ddee067bcd16a6af4ba7ecf66220056d
+ F ext/fts3/fts3_aux.c 72de4cb43db7bfc2f68fbda04b7d8095ae9a6239
+ F ext/fts3/fts3_expr.c dbc7ba4c3a6061adde0f38ed8e9b349568299551
  F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
  F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
  F ext/fts3/fts3_icu.c 6c8f395cdf9e1e3afa7fadb7e523dbbf381c6dfa
@@@ -634,8 -635,8 +635,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test fa6f0e5f13fe0b1d3f7a7613179b7f7b20028184
+ F test/permutations.test 2b5a1b64a8e5114757457fbce9010387d1fe7682
 -F test/pragma.test f6111ded4d56b79436a60a757d62f3c96a9cf3f5
 +F test/pragma.test f11c59ec935a52edb4d3d5676d456588121fcefa
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -991,7 -992,7 +992,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P dec9a995d7012a1f85be4edb71240b9d4f07c60e
- R b4cefaed66b163e0022c525667456b34
- U drh
- Z 8282af4a85e83e5f9dade049cda1072b
 -P 22491e7bc38aee43819b888e04241cb6a6ef73a3
 -R b3e8f4cc7fcd5d7bfa4510a8d2434f16
++P 4f34d7077b9acf7926c5e7375ca870d4ed3c60b9 f8e9c445dd358c40e5a7bf3756b9f291909dbea7
++R 6e003d0f8aa6b8eacd50254a31c50e6a
+ U dan
 -Z 8fb02bd9c9b9481fcea2986d10daaba1
++Z c6f6d9c6291c4c182b564ddd4b9e0a68

diff --cc manifest.uuid
index 84b5cbe82957e07322404ee7101361363008e39d,868a4cc93257915107c4b251d70dbf2a64385794..0025deab2917fa7a081ae79ec3c3cc3c5cf174af
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4f34d7077b9acf7926c5e7375ca870d4ed3c60b9
 -f8e9c445dd358c40e5a7bf3756b9f291909dbea7
++99a9073b5e411ce94f38ce49608baaa15de8b850