Merge origin into eterwine
authorVitaly Perov <vitperov@etersoft.ru>
Sat, 11 Jun 2011 11:26:44 +0000 (15:26 +0400)
committerVitaly Perov <vitperov@etersoft.ru>
Sat, 11 Jun 2011 11:26:44 +0000 (15:26 +0400)
commitc61fabbc31f05af48829a3bc01c3727e715be582
tree74a0cd40b4d01e9e61c2f132384e038b79cd1bda
parentf541fff463498d7520955c4fe9a0e8e9cdc6d9e3
parent0036e438db3b5382ee0a2c53478960fabb892a2c
Merge origin into eterwine

Conflicts:
dlls/ntdll/ntdll_misc.h
dlls/comctl32/toolbar.c
dlls/mshtml/mshtml_private.h
dlls/user32/menu.c
dlls/winex11.drv/event.c
dlls/winex11.drv/window.c
dlls/wininet/internet.c
dlls/winspool.drv/info.c