Merge branch pure

Conflicts:
	tools/make_makefiles

diff --cc .gitignore
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/ntdll/ntdll_misc.h
Simple merge

diff --cc dlls/ws2_32/socket.c
Simple merge

diff --cc include/winternl.h
Simple merge

diff --cc tools/make_makefiles
index 9a513d07b6c7511380eae26c0377c2f4f4da81f2,182aef5e39a413d35c8d41020a8c1a6555db84b2..e0c53daa75c8a9b32a7e986f29665db8c8d2258e
--- 1/tools/make_makefiles
--- 2/tools/make_makefiles
+++ b/tools/make_makefiles
@@@ -96,8 -96,7 +96,9 @@@ my @ignores = 
      "*/*/tests/testlist.c",
      "include/config.h",
      "include/stamp-h",
 +    "etersoft/scripts/wine",
 +    "etersoft/winesplash/winesplash",
+     "msg.pot",
      "programs/winetest/*_test.exe",
      "programs/winetest/*_test.rc",
      "programs/winetest/build.nfo",