Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa pixman xserver xkeyboard-config

Conflicts:
	xorg-server/dix/dispatch.c

10 files changed, 14 insertions, 14 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 114ef3a7a..7e5a666da 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -63,9 +63,9 @@ xkb_symbols "sun_type6" {
    key <AB01> { [               z, Z,               guillemotleft              ]};
    key <AB02> { [               x, X,               guillemotright             ]};
    key <AB07> { [               m, M,               mu                         ]};
-   key <AB08> { [           comma, quoteright,      less                       ]};
+   key <AB08> { [           comma, apostrophe,      less                       ]};
    key <AB09> { [          period, quotedbl,        greater                    ]};
-   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};
+   key <AB10> { [          eacute, Eacute,          grave                      ]};
    
 	include "level3(ralt_switch)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index 213b4f08e..b75c14885 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
@@ -44,8 +44,8 @@ xkb_symbols "sun_type6_de" {
     key <AE07> { [          7,      slash,    brokenbar             ] };
     key <AE08> { [          8,  parenleft,         cent             ] };
     key <AE09> { [          9, parenright                           ] };
-    key <AE10> { [          0,      equal,    quoteleft             ] };
-    key <AE11> { [ quoteright,   question,   dead_acute             ] };
+    key <AE10> { [          0,      equal,        grave             ] };
+    key <AE11> { [ apostrophe,   question,   dead_acute             ] };
     key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
 
     key <AD03> { [          e,          E,     EuroSign             ] };
@@ -84,8 +84,8 @@ xkb_symbols "sun_type6_fr" {
     key <AE07> { [          7,      slash,    brokenbar             ] };
     key <AE08> { [          8,  parenleft,         cent             ] };
     key <AE09> { [          9, parenright                           ] };
-    key <AE10> { [          0,      equal,    quoteleft             ] };
-    key <AE11> { [ quoteright,   question,   dead_acute             ] };
+    key <AE10> { [          0,      equal,        grave             ] };
+    key <AE11> { [ apostrophe,   question,   dead_acute             ] };
     key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
 
     key <AD03> { [          e,          E,     EuroSign             ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index 0818c9ab0..41fa9a972 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
@@ -35,7 +35,7 @@ xkb_symbols "sun_type6" {
 
 	include "sun_vndr/us(sun_type6)"
 
-    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};
+    key <TLDE>	{ [ semicolon, dead_abovering,	grave,          asciitilde 	]	};
     key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};
     key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};
     key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index 13e822c8f..c1ac1176a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
@@ -52,7 +52,7 @@ xkb_symbols "sun_type6" {
     key <AD12> { [  dead_diaeresis,  asciicircum,      asciitilde             ] };
     key <AC10> { [  odiaeresis,      Odiaeresis                               ] };
     key <AC11> { [  adiaeresis,      Adiaeresis                               ] };
-    key <BKSL> { [  apostrophe,      asterisk,         quoteleft              ] };
+    key <BKSL> { [  apostrophe,      asterisk,         grave                  ] };
     key <LSGT> { [  less,            greater,          bar                    ] };
     key <AB08> { [  comma,           semicolon                                ] };
     key <AB09> { [  period,          colon                                    ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index f329c5fd5..20d50eb98 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -34,7 +34,7 @@ xkb_symbols "sun_type6" {
 
 	include "sun_vndr/us(sun_type6)"
 
-    key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };
+    key <TLDE> { [      grave,    notsign,  brokenbar ] };
 
     key <AE02> { [          2,   quotedbl             ] };
     key <AE03> { [          3,   sterling             ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index c30d31e38..e72d84386 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
@@ -57,7 +57,7 @@ xkb_symbols "sun_type6_suncompat" {
     key <AD08> { [ i, I            ], [ kana_NI        ]   };
     key <AD09> { [ o, O            ], [ kana_RA        ]   };
     key <AD10> { [ p, P            ], [ kana_SE        ]   };
-    key <AD11> { [ at, quoteleft   ], [ voicedsound    ]   };
+    key <AD11> { [ at, grave       ], [ voicedsound    ]   };
     key <AD12> { [ bracketleft,    braceleft ], [ semivoicedsound, kana_openingbracket ] };
 
     key <AC01> { [ a, A            ], [ kana_CHI       ]   };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index b333622d9..78800499e 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -34,7 +34,7 @@ xkb_symbols "sun_type6" {
 
 	include "sun_vndr/us(sun_type6)"
 
-    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
+    key <TLDE>  { [     grave,   asciitilde,	notsign,   brokenbar ]    };
     key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };
     key <AE02>  { [    ccaron,       Ccaron,	2,          at ]    };
     key <AE03>  { [   eogonek,      Eogonek,	3,  numbersign ]    };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 8f7a69de0..6d59bc2f4 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -44,7 +44,7 @@ xkb_symbols "sun_type6" {
     key <AE07>  { [         7, underscore,     sterling ] };
     key <AE08>  { [         8,  parenleft,    braceleft ] };
     key <AE09>  { [         9, parenright,   braceright ] };
-    key <AE10>  { [         0, quoteright,   quoteleft ] };
+    key <AE10>  { [         0, apostrophe,        grave ] };
     key <AE11>  { [     slash,   question,    backslash ] };
     key <AE12>  { [    degree, dead_tilde, dead_cedilla ] };
 
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index b6797bb94..4e00113cd 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
@@ -45,7 +45,7 @@ xkb_symbols "sun_type6" {
     key <AE08> { [               8,        parenleft,     bracketleft ] };
     key <AE09> { [               9,       parenright,    bracketright ] };
     key <AE10> { [               0,            equal,      braceright ] };
-    key <AE11> { [      quoteright,         question,       quoteleft ] };
+    key <AE11> { [      apostrophe,         question,           grave ] };
     key <AE12> { [   guillemotleft,   guillemotright                  ] };
     key <AD03> { [               e,                E,        EuroSign ] };
     key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index e3507f0c4..18696bb3f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
@@ -34,7 +34,7 @@ xkb_symbols "sun_type6" {
 
 	include "sun_vndr/us(sun_type6)"
 
-    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};
+    key <TLDE>  { 	[       semicolon, dead_abovering, grave              asciitilde  ]	};
     key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};
     key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};
     key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};