Merge updates from trunk.

FossilOrigin-Name: 375dfe288fd0c4eb3c343a3cb23a7e3851903805

diff --cc manifest
index 05b0b77188a0efe8ea2ca2d103c059c549d789b6,b049cf4d48c1bfde002fac91c953319e21458ff2..6b536697bd559584257b4a3c957ddd90c9f577ad
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sboundary\scase\sfor\sthe\storeal()\sSQL\sfunction.
- D 2013-08-29T01:01:11.268
 -C Small\senhancements\sto\sunit\stesting\sinfrastructure.
 -D 2013-08-29T01:09:14.083
++C Merge\supdates\sfrom\strunk.
++D 2013-08-29T01:11:45.298
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1109,7 -1108,7 +1109,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P ffc6e682836cdf275189427109f8af2aeb423bcd
- R 5b28ae921fcc930fbdb4ed7973c09a22
 -P 6c709338bc77fbed24a2597eabd88dd8c29b38d7
 -R c45150e3b7004e4a0ed3f6fa3be34cd1
++P abe82c634ccda7d62687df5917d18a9d6e411142 9229aeb361f9805894321327d05aba855b8799f3
++R 37bb2eb70562f6e2f1a6470983432e85
  U mistachkin
- Z eee04e7f47bd53db98c6ff93d7e968bb
 -Z 89e12299b0f96674ea40270259273327
++Z 8236c13d7d380aaddad2f7d32e5c8a7f

diff --cc manifest.uuid
index a6f7367f723af7a0c21c8c61966fbab3cff33a75,03763eea4baca86cb952de0d40b3abeabdb2eb2c..fe6fc5eb2633447a993a9b94ffe772afea411d08
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- abe82c634ccda7d62687df5917d18a9d6e411142
 -9229aeb361f9805894321327d05aba855b8799f3
++375dfe288fd0c4eb3c343a3cb23a7e3851903805