Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa xkeyboard-config xserver git update 15 jan 2014
  randrproto libfontenc mesa xserver git update 10 Jan 2014
  randsrproto fontconfig libX11 git update 6 Jan 2014

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp
	mesalib/src/glsl/ir_builder.h
	xorg-server/Xext/xres.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/include/gc.h
	xorg-server/os/access.c

1 files changed, 12 insertions, 12 deletions

diff --git a/xorg-server/xkeyboard-config/compat/japan b/xorg-server/xkeyboard-config/compat/japan
index ab4f85e4c..322bbdb14 100644
--- a/xorg-server/xkeyboard-config/compat/japan
+++ b/xorg-server/xkeyboard-config/compat/japan
@@ -1,11 +1,11 @@
-// Japanese keyboards need Eisu and Kana shift and 
-// lock keys, which are typically bound to the
-// second shift level for some other modifier key.
+// Japanese keyboards need the Eisu and Kana Shift
+// and Lock keys, which are typically bound to the
+// second shift level of some other modifier key.
 // These interpretations disable the default
 // interpretation (which would have these keys set
-// the same modifier as the level one symbol).
+// to the same modifier as the level one symbol).
 
-default partial xkb_compatibility "japan"  {
+default partial xkb_compatibility "japan" {
 
     interpret.repeat= False;
 
@@ -26,16 +26,16 @@ default partial xkb_compatibility "japan"  {
     };
 };
 
-// Some Japanese keyboards have an explict Kana Lock key & matching LED
+// Some Japanese keyboards have an explict
+// Kana Lock key and matching LED.
+partial xkb_compatibility "kana_lock" {
 
-partial xkb_compatibility "kana_lock"  {
-
-    virtual_modifiers Kana_Lock;
+    virtual_modifiers  Kana_Lock;
 
     interpret Kana_Lock+AnyOfOrNone(all) {
-        virtualModifier= Kana_Lock;
-        useModMapMods=level1;
-        action= LockGroup(group=+1);
+	virtualModifier= Kana_Lock;
+	useModMapMods=level1;
+	action= LockGroup(group=+1);
     };
 
     indicator "Kana" {