Merge branch 'master' into eternew

Conflicts:

	dlls/ntdll/serial.c
	dlls/user32/menu.c

diff --cc .gitignore
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/Makefile.in
Simple merge

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

diff --cc dlls/mshtml/mshtml_private.h
Simple merge