Merge latest trunk changes.

FossilOrigin-Name: 24aa20da222a9cc181473bc41d0f8791be91fa97

diff --cc manifest
index b25987a37023383062203e73fccc0028bed5bf79,bb29bafc5abc4aa19d599e948d1eecfdda306647..84e9c1d09ccf15ae67ba5b94786651c907682115
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Allow\sFTS4\smulti-token\sphrases\sto\suse\sa\scombination\sof\sin-memory\sand\sincrementally\sloaded\sdoclists.\sThis\sallows\sphrases\sto\s(partially)\sbenefit\sfrom\sincremental\sdoclists\swithout\sdisabling\sthe\sdeferred\stoken\soptimization.
- D 2013-10-03T19:27:14.455
 -C The\ssqlite3FixInit()\sroutine\scannot\sfail.\s\sSo\schange\sthe\sreturn\stype\sfrom\s"int"\nto\s"void".
 -D 2013-10-03T15:39:44.505
++C Merge\slatest\strunk\schanges.
++D 2013-10-03T20:28:22.404
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1120,7 -1119,7 +1121,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P bc3a2ed5fb2402805928b0002457eebf06f87c47
- R 901c988fa73ccb0a783d711147163b1a
 -P 8338232a111be16d6c2ab57176d0a23a001f02ad
 -R b1cce97e822326c63df11398c4318c43
 -U drh
 -Z da47fe5fd9aed60cdbc3a07080f59327
++P f6819c5f3363d358e7ef65fe6978f13991bd44af 500c5932fe3f5fcd0940522f7839d581c555e0eb
++R 699a595349579dae27a85bc7620bf39e
 +U dan
- Z a8c5d4de2473f3c23eca341d3a936ce8
++Z 5bb0415038281aaab1af73554b907022

diff --cc manifest.uuid
index a09415fd3f79f4b68965446da643a49568c54a8f,f60b01037b7eb959251cb98c7ccb6dae532454d1..169d9fcd3be5ee2c3d0fbc95e2852510d0c0ba7a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f6819c5f3363d358e7ef65fe6978f13991bd44af
 -500c5932fe3f5fcd0940522f7839d581c555e0eb
++24aa20da222a9cc181473bc41d0f8791be91fa97