Merge updates from trunk.

FossilOrigin-Name: 45acf6a85150839d591316418dad59ae20ce3aa4

diff --cc manifest
index 8ca2cb9aa2bfbf769b3bbd30a4df451e3083acd2,98c814021d1b4f824575ef1ff0a17906edb7438b..5a1193d9a98d55a484b1408749215c3508125c03
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C When\ssyncing\sa\smemory\smapped\sfile\son\sWindows,\sflush\sthe\smapped\sview\sas\swell.
- D 2015-03-26T23:36:35.332
 -C Enhancements\sto\sOSTRACE\susage\sin\sthe\sWin32\sVFS.
 -D 2015-03-27T18:20:25.776
++C Merge\supdates\sfrom\strunk.
++D 2015-03-27T18:22:01.427
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -215,7 -215,7 +215,7 @@@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c a4dadbc2da41599e99093e91e276c38c17a73b89
- F src/os_win.c af359cc1f0acc6b091c971ef0cf77c1280048cd3
 -F src/os_win.c 865ba15878eded98bb29a97ac898f2a799dc481a
++F src/os_win.c 1e39f146fceb4d843b8e4d847588bf3e5567e9e0
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
  F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
  F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
@@@ -1247,10 -1247,7 +1247,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 1bc76339e8542770bff7829a3dd346680950c0a5
- R 8fcf9359fa4528c262f390ec8d494656
- T *branch * winViewFlush
- T *sym-winViewFlush *
- T -sym-trunk *
 -P 0ec08ba8a0fa188146b071a489908332693ba59a
 -R 5fa56a67857aa9aa0bfe9c8eabbd7f2b
++P df204049b9ec8dd3e43ed7dc251eaecedc05af4b ab5800291e1908b5b51d912feeacf748dc9be14b
++R 0f0075a96ff27d99566a591d99fb96e9
  U mistachkin
- Z 96541edc57aab968aa95035dbba0935a
 -Z 22e64f81a05ea0084d0b656c0478e6e9
++Z c5eb52c9dcfe775299e290baea598f63

diff --cc manifest.uuid
index e3897a191f6e16431a8f95a6db4fbbda83381d46,50a77b66aa133c0802715bd2801628a70375cf8f..d5f639a0392b6a2e50794c6c15fb102b0b6ecc83
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- df204049b9ec8dd3e43ed7dc251eaecedc05af4b
 -ab5800291e1908b5b51d912feeacf748dc9be14b
++45acf6a85150839d591316418dad59ae20ce3aa4

diff --cc src/os_win.c
Simple merge