Merge commit '1fce703afdf4bac16bdffdb36842549195560805' into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Fri, 28 Jan 2011 09:26:25 +0000 (12:26 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Fri, 28 Jan 2011 09:26:25 +0000 (12:26 +0300)
1  2 
dlls/mshtml/conpoint.c
dlls/mshtml/htmldoc.c

Simple merge
Simple merge