Merge the fork that resulted from a check-in race.

FossilOrigin-Name: b7fe4f362bdf7b233a7b09eb9ce16d296165f82a

diff --cc manifest
index d3b84aa06c16ae2f1ecc690b427d4d66983e1a7e,e9fa983ce42537ca55eb17b042798a228f0f2931..6427c534ac7ae887b64e37ac27dae15defc9e019
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\svalueFromExpr()\sso\sthat\sit\sreturns\sSQLITE_NOMEM\sfollowing\san\sOOM\swhen\nchanging\stext\sencodings.\s\sAlso\sfix\ssome\sasserts\sto\saccommodate\sOOM\serrors.
- D 2013-08-16T14:49:00.182
 -C Fixes\sfor\stest\scode\sthat\swas\snot\sworking\swith\sutf16\sdatabases.\sRun\sthe\sanalyze*.test\sscripts\sas\spart\sof\sthe\s'utf16'\spermutation\stest.
 -D 2013-08-16T14:48:23.663
++C Merge\sthe\sfork\sthat\sresulted\sfrom\sa\scheck-in\srace.
++D 2013-08-16T14:51:32.595
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1107,7 -1107,7 +1107,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
--P 949127d53e0a907ed6f73c6828637d94b265468c
- R 48e5653eb5a198286249664d90ff2dc2
 -R c976c76cd7c81566939cdf0a48444b08
 -U dan
 -Z b5e8345ccccb17f5909eea938b24d774
++P dc1ccd09c443cebc4731dbe1a0dea84a9ccf6a9b fe99494d99df95f699ffab07b1e212800b5ff00d
++R d4423f6bfe7897e7f162dd09be03fa9b
 +U drh
- Z c981aacf279c866f9ae15fcea49df2b7
++Z 09d98cea9440e05f9750de825f016c53

diff --cc manifest.uuid
index b169310d7ed452d6505d63b6cdd8c71771f49542,fe107f0a22bcb5df1a50c9f30351ee240fe46f89..7e02239584763d956bcb1f683b60fb3aea9c8120
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dc1ccd09c443cebc4731dbe1a0dea84a9ccf6a9b
 -fe99494d99df95f699ffab07b1e212800b5ff00d
++b7fe4f362bdf7b233a7b09eb9ce16d296165f82a