Merge the ota-update branch with trunk.

FossilOrigin-Name: 08e2864ed7c2d36410a248459061dcbd5576e145

diff --cc manifest
index 6244204eab9b36992e06eb204bef9dc137baf7d2,be8d96b7792517303eed5b3636c487ca8e0e6ebb..7c928da597156a71fbcaeac4d35fb4a4ac1f0ba2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Transitive\sconstraints\sshould\sonly\swork\sif\soperands\shave\scompatible\naffinities\sand\scollating\ssequences.
- D 2015-05-18T12:28:09.009
 -C Add\sa\scomment\sfor\sSQLITE_FCNTL_OTA\sto\ssqlite.h.in.
 -D 2015-05-19T16:26:51.563
++C Merge\sthe\sota-update\sbranch\swith\strunk.
++D 2015-05-19T16:50:18.742
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
+ F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc f9da80e91c8f953f7517c979a1540ef8af1b386f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -1258,8 -1278,7 +1278,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9c0d80907b4dee8ee8f205c2ebdb759f5ba1d771 204e567f68e4b3e069f04ca0643c6e5db781d39f
- R a4e8ba2aafa10a2da2324dbd46c77e5c
- T +closed 204e567f68e4b3e069f04ca0643c6e5db781d39f
- U drh
- Z b4b536b620859a084b09e8398affe376
 -P 5af8db56af457d60ea030d84666ca7fffb6821fe
++P 5df4056448fee1c766f8f79c735ed12abdce5101 efa20f8e41e9370f419f055efa941a8521c68c86
+ R 90f51428989ad97de8b5b492628ddcf2
+ U dan
 -Z 939b1bde27d2b3f6f6554896ab8cea12
++Z c66936b8d4c1f56a0c4fa9f1d6ac6c57

diff --cc manifest.uuid
index 472e26ef0afb19e9af14e00fd8583be3b437117d,34527a48ba6164538127c19fa0f2f0df3a465958..f191118f132ddd09d1c617d66de830b6814fe794
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5df4056448fee1c766f8f79c735ed12abdce5101
 -efa20f8e41e9370f419f055efa941a8521c68c86
++08e2864ed7c2d36410a248459061dcbd5576e145