Merge updates from trunk.

FossilOrigin-Name: 69698ae90c415cb32d2c144725853483da65f0ff

diff --cc manifest
index 53adfd7ce9fd0ce94b13b3b6dfb7d968139d7f69,91f6b157b3b5f3505ca280b02a2dfbb2710d0481..e7b886da5d72a78a02dc4f1a3df578aa14f2fcd4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Update\sthe\stemplate\sVSIX\spackage\sfile\sas\swell.
 -D 2014-05-06T21:37:10.782
 +C Merge\supdates\sfrom\strunk.
- D 2014-05-06T21:30:25.036
++D 2014-05-06T21:37:52.426
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1168,7 -1168,7 +1168,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P 8be166af239cbdaff3937c4003a6dc6e8a96e53a c1fb04f61eb74d80d1b7607ae6904fe2e1717988
 -P c1fb04f61eb74d80d1b7607ae6904fe2e1717988
 -R e86d9d0c4e9d221c23e483062a69a0ee
++P 7579c44ac1865133c37b16f2acc074d1eed4fdfd 99d96765cc378fde7b285f4577ea2b5d130d9a61
 +R b392192acbeb452efb75eebb9d223240
  U mistachkin
- Z 39d35e31175990b3b740ccac33ccbea0
 -Z 61035ffe1ca5b1a658207d61a8a19a18
++Z f802d6476e6e3da761b28f52bb275366

diff --cc manifest.uuid
index 775af7deceae94230dede3fea52f8e63a941549e,eaa07f737380bf17d8bf6b22f9e614d58e4bcd26..b18c38c41b2e3677c8f0b8529d0cac6213a13b1d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7579c44ac1865133c37b16f2acc074d1eed4fdfd
 -99d96765cc378fde7b285f4577ea2b5d130d9a61
++69698ae90c415cb32d2c144725853483da65f0ff