Merge branch 'master' of git://source.winehq.org/git/wine into eterhack

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

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

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

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

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