Merge the nx-devkit changes into trunk.

FossilOrigin-Name: cf3bccc2e944cd2dd3efb8554682994a06115f16

diff --cc manifest
index ba72d04b26a0a590404322c0e0b934be09d5c45b,1257f0f4ca64f9311e88cfa34721190389e848fb..9d87384e8d431036d48fae6ec2b7b95952d01c4b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sstdio\ssupport\sto\sthe\squota\sVFS.
- D 2011-12-15T17:44:33.259
 -C Tweaks\sto\sthe\sway\smultiplexSubOpen()\sworks,\sfor\sbackwards\scompatibility.
 -D 2011-12-16T05:50:39.331
++C Merge\sthe\snx-devkit\schanges\sinto\strunk.
++D 2011-12-16T13:42:03.408
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -235,16 -234,16 +235,16 @@@ F src/test_vfstrace.c 065c7270a614254b2
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
 -F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
 -F src/update.c 25e046a8f69d5e557aabde2000487b8545509d8d
 +F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 +F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 01238e2b0f24a14779181dbf991fe02620a80e31
+ F src/util.c 343508d359df65685b62e63964a40e7af4cfbe05
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
 -F src/vdbe.c a7ab9993ec5a4d9479dc99671faec061fbf9b889
 -F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
 -F src/vdbeInt.h 9498fc98a2c9e349a4ef13455ff5a3e898f40176
 -F src/vdbeapi.c 4dbba7f94f127f6ea8d2d0505ee1f98e5ffbf546
 -F src/vdbeaux.c 52ebf2a62d6b66ded536d0a2745f2236771097c7
 +F src/vdbe.c 029add0c5197a61db588824a58570547330b9d8f
 +F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 +F src/vdbeInt.h 48c158b2fceca9682d1577e61c62da3c58cf0748
 +F src/vdbeapi.c 86189ebba2c49791d75eaa12929f3ce6527596bd
- F src/vdbeaux.c 61a3cc2b3a713aa244598a13035471cc30b307e1
++F src/vdbeaux.c 4a96cddec7c8cc33f98da703c1baf2a654b50cab
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
@@@ -983,7 -978,7 +983,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P da118e02c0576ce16f7a26663f59413316223d55 e85cfe9a17a2943ee0cf7915451ff6cc05908030
- R 4fb854e64d34a9b880548a23455e8f4d
 -P 022bf427c2edfe494ec7c222f436953ff56574a6
 -R 29ea54dcd671c93952fcbf93e86a1060
++P 322bd15f97143d39b3a88d5f6cf7afb454e0666e bb40338887c912be70cb6fe3b760d87c14bb88a5
++R a70f90ef372516f64947505d1ba22869
  U drh
- Z 1f8384d1da732a66b49bdc6038214de7
 -Z b9fbbc1fe20301c015fc0588c12a3621
++Z a2e5ef34107012b45c32946167d7851d

diff --cc manifest.uuid
index 07d7da1bd9e36f39f1abff09bce0dfff62ebbea0,6edf6058c33752d888c4a7b41e581e1ffedb31b3..d3c7f87bf80aed9404b4e4fe48baffb073bacfb2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 322bd15f97143d39b3a88d5f6cf7afb454e0666e
 -bb40338887c912be70cb6fe3b760d87c14bb88a5
++cf3bccc2e944cd2dd3efb8554682994a06115f16

diff --cc src/vdbeaux.c
Simple merge