Merge trunk changes into experimental again.

FossilOrigin-Name: 87e0f4e184284bf775c2fc7c4e9a334f4f237c59

diff --cc manifest
index a82fdbb928d5a6c89dd1f0cbcb53e7c7b8de3844,0c611181fb00084a565ccfcc5b9ddfc8deae8e18..c592de600eef86a8b6c0faae3c81aaba9d5bd48a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\stest\scases\sfor\sbug\s[f3e5abed55].
- D 2010-07-30T10:09:12
 -C Changes\sto\sthe\scomments\sdescribing\sthe\sPager.setMaster\svariable\sin\spager.c.\sAdd\san\sassert()\sstatement\sto\sverify\sthat\stwo\smaster\sjournal\spointers\sare\snot\swritten\sto\sa\ssingle\sjournal\sfile.
 -D 2010-07-30T11:31:13
++C Merge\strunk\schanges\sinto\sexperimental\sagain.
++D 2010-07-30T14:39:13
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -154,10 -154,10 +154,10 @@@ F src/os.c 60178f518c4d6c0dcb59f7292232
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
 -F src/os_unix.c 3109e0e5a0d5551bab2e8c7322b20a3b8b171248
 -F src/os_win.c 1f8b0a1a5bcf6289e7754d0d3c16cec16d4c93ab
 -F src/pager.c 3f2373792cb5c23043cef31878a13b37b0ade1f6
 +F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 +F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
- F src/pager.c 237bee4c1cec621821e05c7c808f631d4ee3aa32
- F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
++F src/pager.c d493b8164eee3339730983121cf1c6215af157aa
+ F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
@@@ -841,7 -840,7 +841,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 50c0f2202d21bbf6b593d75fd20f13c0fac23eff
- R 90c2b80ec44f603bca769c7fc17c6688
 -P 40f7f0a583e6bba66cd006253a0ef4623ea74f17
 -R 9a1109c31f7ded9ef1e129e63eeacbd6
++P cbbaf8e67a23dc332ce935bc7234246eacba60bf ad78ccacb00e2f8a5ca93e2c9006266d9477fe48
++R acbdc50f69dbd02f5f58643fea54f04c
  U dan
- Z 1b5da3789844ce06cb648b709ee8c441
 -Z 55381d586c03f9b763a259356223e4c4
++Z 94891c66bfdc0aff59f3a65e9a0b9b92

diff --cc manifest.uuid
index b6eb3e72e3c43665bd806d5fd15984312bd13af7,3917952cf19fbf967181d86286997458778b3018..c68a24af754adb9f58950088c2ec3bc9715fa3be
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cbbaf8e67a23dc332ce935bc7234246eacba60bf
 -ad78ccacb00e2f8a5ca93e2c9006266d9477fe48
++87e0f4e184284bf775c2fc7c4e9a334f4f237c59

diff --cc src/pager.c
Simple merge