Merge commit 'c9bbfd493ae83653394cc777ae3d93730550240c' into eterhack

diff --cc dlls/mshtml/htmldoc.c
Simple merge

diff --cc dlls/msi/action.c
Simple merge

diff --cc dlls/msi/msipriv.h
Simple merge

diff --cc dlls/msi/package.c
Simple merge

diff --cc dlls/ntdll/directory.c
Simple merge

diff --cc dlls/user32/winpos.c
Simple merge

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

diff --cc server/file.c
Simple merge

diff --cc tools/wine.inf.in
Simple merge

diff --cc tools/winebuild/spec32.c
Simple merge