Merge branch 'master' into x86_64

Conflicts:
	build/jam/FloppyBootImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	headers/private/shared/cpu_type.h
	src/bin/ps.c
	src/bin/sysinfo.cpp
	src/kits/tracker/PoseView.cpp
	src/preferences/appearance/DecorSettingsView.cpp
	src/preferences/virtualmemory/Settings.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/input/InputServer.cpp
	src/servers/input/InputServerMethod.cpp
	src/system/boot/Jamfile
	src/system/boot/platform/raspberrypi_arm/mmu.cpp
	src/system/boot/platform/u-boot/arch/arm/Jamfile
	src/system/kernel/arch/x86/arch_cpu.cpp
	src/system/kernel/arch/x86/arch_thread.cpp
	src/system/kernel/cache/block_cache.cpp
	src/system/kernel/vm/VMAnonymousCache.cpp

headers/os/interface/TextView.h

@@ -294,9 +294,11 @@ private:
 			void				_ResetTextRect();
 
 			void				_HandleBackspace();
-			void				_HandleArrowKey(uint32 inArrowKey);
+			void				_HandleArrowKey(uint32 inArrowKey,
+									bool commandKeyDown = false);
 			void				_HandleDelete();
-			void				_HandlePageKey(uint32 inPageKey);
+			void				_HandlePageKey(uint32 inPageKey,
+									bool commandKeyDown = false);
 			void				_HandleAlphaKey(const char* bytes,
 									int32 numBytes);
 
@@ -451,8 +453,10 @@ private:
 			float				fMinTextRectWidth;
 			LayoutData*			fLayoutData;
 			int32				fLastClickOffset;
+			bool				fInstalledNavigateWordwiseShortcuts;
+			bool				fInstalledNavigateToTopOrBottomShortcuts;
 
-			uint32				_reserved[7];
+			uint32				_reserved[6];
 };
 
 #endif	// _TEXTVIEW_H