Merge accidental fork.

FossilOrigin-Name: e85628e34ac684b8a23f49eee71e4d6546e0ef64

diff --cc manifest
index be7faba131308f811fde758052aa92bd35dc3b55,be612ee54e6ec188f54a0eaeb87018ac8f2c5998..c5b75f1249499b0980cb151465db45d76d85b6f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sone-byte\sbuffer\soverread\sthat\smay\sfollow\sa\ssyntax\serror\swhile\spreparing\san\sSQL\sstatement.
- D 2015-05-26T18:58:57.869
 -C Fix\sfuzzcheck\sso\sthat\sit\sresponds\scorrectly\sto\sthe\sTEST_FAILURE\senvironment\nvariable.
 -D 2015-05-26T18:58:32.863
++C Merge\saccidental\sfork.
++D 2015-05-26T19:01:36.410
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3feb7cbdad8898fe7a8a24355b4a753029c3ec3b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1279,7 -1279,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 4a5f6f1f0128657fd8d4d99d0682edd5bac2a19e
- R 065e508f512bb407d5d12027502751ea
 -R 34618a877d8634e9a07e4ff5d1f155f6
 -U drh
 -Z 0abf5657eb193b1248f700399402e06c
++P 075003930da98419f671b7833a5850693529fb62 76770c9e061e2eb106d7ea402eef888b98ba9d0e
++R 3d82c0fa4f6ee04379bd9745bde5d911
 +U dan
- Z 196ef8f8d5bf66f74ab95e80a414f84a
++Z 537a6ddf41a5c2e06d41f2aa9a07cb1e

diff --cc manifest.uuid
index 2f41346a67d8a6b88dbafb4d6f341dfb9c8f660d,fd879aacbb3eb92fcd6878e6e39a8d4a061c0993..6139e323ce4e17174de03f7421419393c0a024c4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 075003930da98419f671b7833a5850693529fb62
 -76770c9e061e2eb106d7ea402eef888b98ba9d0e
++e85628e34ac684b8a23f49eee71e4d6546e0ef64