Merge eterwine into eterhack

Conflicts:
	dlls/shell32/shelldispatch.c
	dlls/shell32/tests/shelldispatch.c

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/comdlg32/filedlg.c
Simple merge

diff --cc dlls/gdi32/font.c
Simple merge

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

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

diff --cc dlls/ole32/clipboard.c
Simple merge

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

diff --cc dlls/winex11.drv/clipboard.c
Simple merge

diff --cc include/config.h.in
Simple merge