Merge in trunk fixes.

FossilOrigin-Name: c71c2e1a991775e1711e9621a59dd8a60eec329b

diff --cc manifest
index 737af4779bf8593abd88ed8030a9ba17499b4395,bf53b3065fa5fe3f7ff14718f466466c171a7672..0370ee4e3ca8bbac47a5d93d52a77a412e0c8824
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improved\stracing\scapabilities\sin\sfuzzcheck.
- D 2015-05-25T22:17:06.593
 -C Fix\sa\scase\sof\sa\scorrupt\sdatabase\scausing\sSQLite\sto\sread\sfrom\sup\sto\s4\sbytes\sbefore\sthe\sstart\sof\sa\smemory\sallocation.
 -D 2015-05-25T20:04:15.531
++C Merge\sin\strunk\sfixes.
++D 2015-05-25T22:18:33.572
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1279,7 -1278,7 +1279,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 12e95e3f178b89d649bc7e30db731df439ae1653
- R df913344b7d3616e49af599608d3d74e
 -P aa18c8e9d1676b1caa53bc5f5c1dc5f201089b88
 -R 2543e1ce5d351c3852d827d2b79794af
 -U dan
 -Z bdd86a9186a2d4ac711797171541a410
++P 864bfdbfe7b196cc9df2136b15a28e2a0f2713cb 7d2c4f7b6695806ab8ce0c6f49d8bc1d77a4320b
++R 9f4c15449a7a5268b20bd4afaa94ba40
 +U drh
- Z 7099e69332034b78c8602623e54bc3b8
++Z 4b2b2637896560e00230932f0089f20d

diff --cc manifest.uuid
index 634ba41006b679cf49ee16209ab077fe5090c4cd,878c55a588f80b79b9b5f5030a5d3aa19589334d..cc546eb2f306799ed8a993c6b02965f4ae6bea24
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 864bfdbfe7b196cc9df2136b15a28e2a0f2713cb
 -7d2c4f7b6695806ab8ce0c6f49d8bc1d77a4320b
++c71c2e1a991775e1711e9621a59dd8a60eec329b