Sync with trunk (r48144)

svn path=/branches/reactos-yarotows/; revision=48150

diff --cc base/applications/mscutils/eventvwr/lang/en-US.rc
Simple merge

diff --cc base/shell/cmd/lang/de-DE.rc
Simple merge

diff --cc base/shell/cmd/lang/ja-JP.rc
Simple merge

diff --cc base/shell/cmd/lang/ru-RU.rc
Simple merge

diff --cc boot/freeldr/bootsect/ext2.asm
Simple merge

diff --cc boot/freeldr/bootsect/fat.asm
Simple merge

diff --cc boot/freeldr/bootsect/fat32.asm
Simple merge

diff --cc boot/freeldr/bootsect/isoboot.asm
Simple merge

diff --cc boot/freeldr/bootsect/isobtrt.asm
Simple merge

diff --cc boot/freeldr/freeldr/freeldr.rbuild
Simple merge

diff --cc boot/freeldr/freeldr/freeldr_amd64.lnk
index 0000000,bb677e8..bb677e8
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk
+++ b/boot/freeldr/freeldr/freeldr_amd64.lnk

diff --cc boot/freeldr/freeldr/freeldr_i386.lnk
index 0000000,48b7b5d..48b7b5d
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/boot/freeldr/freeldr/freeldr_i386.lnk
+++ b/boot/freeldr/freeldr/freeldr_i386.lnk

diff --cc boot/freeldr/freeldr/setupldr.rbuild
Simple merge

diff --cc dll/cpl/access/resource.h
Simple merge

diff --cc dll/cpl/intl/lang/ro-RO.rc
Simple merge

diff --cc dll/cpl/sysdm/lang/ro-RO.rc
Simple merge

diff --cc dll/win32/devmgr/lang/ro-RO.rc
Simple merge

diff --cc dll/win32/msgina/lang/ro-RO.rc
Simple merge

diff --cc drivers/bus/acpi/acpi.rbuild
Simple merge

diff --cc include/psdk/rpcndr.h
Simple merge

diff --cc include/psdk/sdkddkver.h
Simple merge

diff --cc include/reactos/mingw-w64/sect_attribs.h
Simple merge

diff --cc include/reactos/wine/commctrl.h
Simple merge

diff --cc include/reactos/wine/ddk/compstui.h
Simple merge

diff --cc include/reactos/wine/ddk/winddiui.h
Simple merge

diff --cc include/reactos/wine/ddk/winsplp.h
Simple merge

diff --cc lib/3rdparty/mingw/CRT_fp10.c
Simple merge

diff --cc lib/3rdparty/mingw/CRT_fp8.c
Simple merge

diff --cc lib/3rdparty/mingw/crtexe.c
Simple merge

diff --cc lib/3rdparty/mingw/gs_support.c
Simple merge

diff --cc lib/3rdparty/mingw/tlssup.c
Simple merge

diff --cc ntoskrnl/ntoskrnl_amd64.lnk
index 0000000,c8ea8e4..c8ea8e4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/ntoskrnl/ntoskrnl_amd64.lnk
+++ b/ntoskrnl/ntoskrnl_amd64.lnk