From 4b4ee0dc63abddffdc64355429e4ea9ccaa4d36d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 9 May 2010 21:30:23 +0000
Subject: svn merge -r577:HEAD ^/branches/released .

---
 xorg-server/xkbdata.src/rules/base.xml.in | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'xorg-server/xkbdata.src/rules')

diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index 3a2cfe251..969906b81 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -4437,6 +4437,23 @@
 	<_description>Kenya</_description>
         <languageList><iso639Id>swa</iso639Id></languageList>
       </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kik</name>
+            <_description>Kikuyu</_description>
+            <languageList><iso639Id>kik</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bw</name>
+        <_shortDescription>Bwa</_shortDescription>
+	<_description>Botswana</_description>
+        <languageList><iso639Id>tsn</iso639Id></languageList>
+      </configItem>
     </layout>
   </layoutList>
   <optionList>
-- 
cgit v1.2.3