* Sync up to trunk head (r65120).

svn path=/branches/shell-experiments/; revision=65121

diff --cc boot/bootdata/hivedef.inf
Simple merge

diff --cc dll/win32/kernel32/kernel32.rc
Simple merge

diff --cc dll/win32/kernel32/winnls/lang/cs-CZ.rc
index 0000000,cc88926..cc88926
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc
+++ b/dll/win32/kernel32/winnls/lang/cs-CZ.rc

diff --cc dll/win32/kernel32/winnls/lang/en-US.rc
Simple merge

diff --cc dll/win32/kernel32/winnls/lang/fr-FR.rc
Simple merge

diff --cc dll/win32/kernel32/winnls/lang/sq-AL.rc
Simple merge

diff --cc dll/win32/kernel32/winnls/lang/tr-TR.rc
Simple merge

diff --cc dll/win32/netapi32/user.c
Simple merge

diff --cc drivers/filesystems/fastfat/create.c
Simple merge

diff --cc drivers/filesystems/fastfat/fsctl.c
Simple merge

diff --cc drivers/filesystems/fastfat/iface.c
Simple merge

diff --cc drivers/filesystems/fastfat/misc.c
Simple merge

diff --cc drivers/filesystems/ntfs/fsctl.c
Simple merge

diff --cc drivers/filesystems/ntfs/ntfs.h
Simple merge

diff --cc drivers/filesystems/ntfs/volinfo.c
Simple merge

diff --cc drivers/storage/class/disk/disk.c
Simple merge

diff --cc drivers/storage/ide/uniata/id_ata.cpp
Simple merge

diff --cc drivers/storage/ide/uniata/id_init.cpp
Simple merge

diff --cc drivers/storage/ide/uniata/uniata_ver.h
Simple merge

diff --cc media/nls/c_037.nls
index 7498213,56899dd..56899dd
Binary files differ

diff --cc ntoskrnl/io/iomgr/file.c
Simple merge