Cherry-pick the correct changes out of the recent "mistake" branch while

omitting the bogus changes.

FossilOrigin-Name: 48bf309391c32e7860c293acd13f3dda14212d39

diff --cc manifest
index eb168f7314b84371c47523a1759457ff1efad5bc,88edf9d4af3e6d74f6432b4a9adba78a231b2d62..1db97208fcf065cb912fb458afb51e03a1376ab3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C Add\sinitializers\sfor\sthe\sxShmXXX()\smembers\sto\san\ssqlite3_io_methods\sstructure\sin\sjournal.c.\sThis\sdoesn't\sfix\sany\sreal\sproblem,\sjust\sprevents\sa\scompiler\swarning.
- D 2010-07-02T16:36:18
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Remove\scode\saccidently\sappended\sto\spager.c.
 -D 2010-07-03T12:26:33
++C Cherry-pick\sthe\scorrect\schanges\sout\sof\sthe\srecent\s"mistake"\sbranch\swhile\nomitting\sthe\sbogus\schanges.
++D 2010-07-03T12:31:35
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -830,7 -833,14 +833,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 01c1278263fdd8454763be15bddd2558e720e6e0
- R f945708978bd6e2d6ef2b7036668ceb3
- U dan
- Z 365ea1ba861987a397d4382540eb2770
 -P 6d7640edcd69a932556f86500aedbf14e75ba7de
++P dafb3577a2d5fbeebb17c8176af837f0aebf6ee5 7cbe175a69738499f9218ec56f1a39f040aea9dc
+ R d0b007e2ef9688923f10274954448b62
+ U drh
 -Z be2fc7329c7e3b5fca1a0eb4a8d0cff8
++Z 9ed89a67888dd059d0adfcf46fe44cff
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFMLyx8oxKgR168RlERAkl1AJ4ohtqY31ahBbiC1mts0x8F0P605ACcC9FU
 -hIo83ZyxiUs6yqlF5ffrsAg=
 -=NNUf
++iD4DBQFMLy2qoxKgR168RlERAgB/AJjRY22W8BVzKcuM5rE4E50Yg6ZtAKCKl5Ee
++AuDXrVc9U2hm2JSf79toLw==
++=6dms
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 383e7207c3069330214f06ab6e5d9550e657e0c6,359a11ad69b309afa6cdb4b41f0d16b96ba598ed..cff5c849cd1114019778a0297bf9f55f030dd44b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dafb3577a2d5fbeebb17c8176af837f0aebf6ee5
 -7cbe175a69738499f9218ec56f1a39f040aea9dc
++48bf309391c32e7860c293acd13f3dda14212d39