Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013

Conflicts:
	libX11/src/xkb/XKBGAlloc.c
	libX11/src/xkb/XKBMisc.c

2 files changed, 49 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 253effded..721291985 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -78,12 +78,19 @@
   ctrl:ralt_rctrl	=	+ctrl(ralt_rctrl)
   compose:ralt		=	+compose(ralt)
   compose:lwin		=	+compose(lwin)
+  compose:lwin-altgr	=	+compose(lwin-altgr)
   compose:rwin		=	+compose(rwin)
+  compose:rwin-altgr	=	+compose(rwin-altgr)
   compose:menu		=	+compose(menu)
+  compose:menu-altgr	=	+compose(menu-altgr)
   compose:lctrl		=	+compose(lctrl)
+  compose:lctrl-altgr	=	+compose(lctrl-altgr)
   compose:rctrl		=	+compose(rctrl)
+  compose:rctrl-altgr	=	+compose(rctrl-altgr)
   compose:caps		=	+compose(caps)
+  compose:caps-altgr	=	+compose(caps-altgr)
   compose:102		=	+compose(102)
+  compose:102-altgr	=	+compose(102-altgr)
   compose:paus		=	+compose(paus)
   compose:prsc		=	+compose(prsc)
   compose:sclk		=	+compose(sclk)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 83dc894e2..95790dda8 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -6282,42 +6282,84 @@
       </option>
       <option>
         <configItem>
+          <name>compose:lwin-altgr</name>
+          <_description>3rd level of Left Win</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:rwin</name>
           <_description>Right Win</_description>
         </configItem>
       </option>
       <option>
         <configItem>
+          <name>compose:rwin-altgr</name>
+          <_description>3rd level of Right Win</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:menu</name>
           <_description>Menu</_description>
         </configItem>
       </option>
       <option>
         <configItem>
+          <name>compose:menu-altgr</name>
+          <_description>3rd level of Menu</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:lctrl</name>
           <_description>Left Ctrl</_description>
         </configItem>
       </option>
       <option>
         <configItem>
+          <name>compose:lctrl-altgr</name>
+          <_description>3rd level of Left Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:rctrl</name>
           <_description>Right Ctrl</_description>
         </configItem>
       </option>
       <option>
         <configItem>
+          <name>compose:rctrl-altgr</name>
+          <_description>3rd level of Right Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:caps</name>
           <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
+          <name>compose:caps-altgr</name>
+          <_description>3rd level of Caps Lock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:102</name>
           <_description>&lt;Less/Greater&gt;</_description>
         </configItem>
       </option>
       <option>
         <configItem>
+          <name>compose:102-altgr</name>
+          <_description>3rd level of &lt;Less/Greater&gt;</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:paus</name>
           <_description>Pause</_description>
         </configItem>