Merge commit 'ad30f962d1c74ce51f1908140f0d53a4687e537d' into eterhack

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/comctl32/listview.c
Simple merge

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

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

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

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

diff --cc programs/winemenubuilder/winemenubuilder.c
Simple merge

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