Merge updates from trunk.

FossilOrigin-Name: 6f07f20e41446212a86989a5e6ce7f12998a3ae3

diff --cc manifest
index df82a686b4a0c474423533c6e65d8e037a0bcc75,44f5a64a123c11a809dd8cc1ce421e5f2d2af028..951c3069c10744c4d4ff7b86f70c1247c274444c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Preliminary\schanges\sto\ssupport\sbuilding\sVSIX\spackages\sfor\sWindows\s8.0\sand\sWindows\sPhone\s8.0\susing\sVisual\sStudio\s2013.
- D 2014-04-21T18:00:11.146
 -C Enhance\sthe\sWin32\sVFS\sI/O\sretry\slogic.
 -D 2014-05-02T22:39:54.345
++C Merge\supdates\sfrom\strunk.
++D 2014-05-05T17:49:16.260
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1159,8 -1165,8 +1165,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 -F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
 -P faa469355eabb2c407f24638b090725448aac37f 598a3875ce98015e9a38db54bd0cb6290424c3d8
 -R ea09ee65f031a4f810c7f319ecf812cc
 +F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P a1b2f28ba85b043df68875f5d3446140db4f2cb0
- R c68a023e71ddd46ca56f8a556c77ce10
++P 3bf97c811a25babf760f256245c756ed6710f8ba 4760504396bcf44528eb8de9ed7aa5d9659c54b6
++R 7528c11f061c95d3eb643567861393ad
  U mistachkin
- Z aa4cbe46e2e91580e28bf4f7ed1db0b0
 -Z f9afa829a6179e568b33b0a29e5a3328
++Z 8a7d8ea3a97a1cbf05228bbd87de6ceb

diff --cc manifest.uuid
index 0f284be18699e69b4a3e288ac91f266c48e10d50,fea2bea1a8418c8f2e89c8be4d736679c881388c..ab0f6fa58911e9f1730053c0755c242698026b13
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3bf97c811a25babf760f256245c756ed6710f8ba
 -4760504396bcf44528eb8de9ed7aa5d9659c54b6
++6f07f20e41446212a86989a5e6ce7f12998a3ae3