Merge the fts4-incr-merge-exp branch with fts4-incr-merge.

FossilOrigin-Name: eb00b95885023a8592693f0babbb0066207073b0

diff --cc manifest
index 80bdaf0fc45b845e5c791d82f3e1b8c6390b875b,533d49a69afe5151fb6f656b46fa4f64073cc1eb..068fa1017a793c789b7e87b86ff9b755db97664f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\scorrect\serrors\sin\sthe\sfile\sformat\sdescription\sfor\sFTS3/4\scontained\sin\nthe\sfts3.c\sheader\scomment.
- D 2012-03-27T00:38:33.806
 -C Allow\smultiple\sincremental\smerges\sto\sproceed\sconcurrently.\sThis\sis\srequired\sto\sprevent\sa\slarge\scrisis-merge\sfrom\soccuring\swhile\san\seven\slarger\sincremental-merge\sis\sunderway.
 -D 2012-03-27T11:48:02.399
++C Merge\sthe\sfts4-incr-merge-exp\sbranch\swith\sfts4-incr-merge.
++D 2012-03-27T13:44:28.992
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1000,7 -1000,10 +1000,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 6d09de231b68dd9520d99c65d133f26e90eb784f
- R 52fac8e81373757809153ddbb5601b3a
- U drh
- Z 7768dc9c0ca55bddb36c9095acc2e9ee
 -P fb8aacdd8fbdc946cb271cc589f76b806387937d
++P fb8aacdd8fbdc946cb271cc589f76b806387937d 7ed9d2f24a650b424b97dfc19b8042c4cf09c82c
+ R a481c2564099a87723843f2e40a259a7
 -T *branch * fts4-incr-merge-exp
 -T *sym-fts4-incr-merge-exp *
 -T -sym-fts4-incr-merge *
+ U dan
 -Z 42d22ddb577089e47eaff1e8771c43d5
++Z cbd151378395e54c0cdc970e0e7f2163

diff --cc manifest.uuid
index 461c1272728c338e1ff3db3a96929ce27343c197,334f6758db8d9c7743aa00bd00a02dfb527f55ea..b6310eca9a41ca27de736c1994d7fcfce99ddfda
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fb8aacdd8fbdc946cb271cc589f76b806387937d
 -7ed9d2f24a650b424b97dfc19b8042c4cf09c82c
++eb00b95885023a8592693f0babbb0066207073b0