--- /usr/share/X11/xkb/rules/base	2008-05-28 15:13:37.000000000 +0300
+++ usr/tmp/base	2008-07-28 12:41:19.000000000 +0300
@@ -183,9 +183,10 @@
   *		ogham		is434laptop		=	pc+ie(ogam_is434)
   *		ori		basic		=	pc+in(ori)
   *		ro		de		=	pc+ro(winkeys)
-  *		ro		us		=	pc+ro(std_comma)
-  *		ro		std		=	pc+ro(std_cedilla)
-  *		ro		academic		=	pc+ro(std_comma)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma	=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
   *		ru		os		=	pc+ru(os_legacy)
   *		sapmi		basic		=	pc+no(smi)
   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
@@ -258,9 +259,8 @@
   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
   *		ori(basic)			=	pc+in(ori)
   *		ro(de)			=	pc+ro(winkeys)
-  *		ro(us)			=	pc+ro(std_comma)
-  *		ro(std)			=	pc+ro(std_cedilla)
-  *		ro(academic)			=	pc+ro(std_comma)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
   *		ru(os)			=	pc+ru(os_legacy)
   *		sapmi(basic)			=	pc+no(smi)
   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
@@ -359,9 +359,8 @@
   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
   *		ori(basic)			=	pc+in(ori)
   *		ro(de)			=	pc+ro(winkeys)
-  *		ro(us)			=	pc+ro(std_comma)
-  *		ro(std)			=	pc+ro(std_cedilla)
-  *		ro(academic)			=	pc+ro(std_comma)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
   *		ru(os)			=	pc+ru(os_legacy)
   *		sapmi(basic)			=	pc+no(smi)
   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
@@ -417,9 +416,8 @@
   *		ogham		is434laptop		=	pc+ie(ogam_is434)
   *		ori		basic		=	pc+in(ori)
   *		ro		de		=	pc+ro(winkeys)
-  *		ro		us		=	pc+ro(std_comma)
-  *		ro		std		=	pc+ro(std_cedilla)
-  *		ro		academic		=	pc+ro(std_comma)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
   *		ru		os		=	pc+ru(os_legacy)
   *		sapmi		basic		=	pc+no(smi)
   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
@@ -492,9 +490,8 @@
   ogham(is434laptop)	=	+ie(ogam_is434):2
   ori(basic)	=	+in(ori):2
   ro(de)	=	+ro(winkeys):2
-  ro(us)	=	+ro(std_comma):2
-  ro(std)	=	+ro(std_cedilla):2
-  ro(academic)	=	+ro(std_comma):2
+  ro(us)	=	+ro(std):2
+  ro(academic)	=	+ro(std):2
   ru(os)	=	+ru(os_legacy):2
   sapmi(basic)	=	+no(smi):2
   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
@@ -568,9 +565,8 @@
   ogham(is434laptop)	=	+ie(ogam_is434):3
   ori(basic)	=	+in(ori):3
   ro(de)	=	+ro(winkeys):3
-  ro(us)	=	+ro(std_comma):3
-  ro(std)	=	+ro(std_cedilla):3
-  ro(academic)	=	+ro(std_comma):3
+  ro(us)	=	+ro(std):3
+  ro(academic)	=	+ro(std):3
   ru(os)	=	+ru(os_legacy):3
   sapmi(basic)	=	+no(smi):3
   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
@@ -644,9 +640,8 @@
   ogham(is434laptop)	=	+ie(ogam_is434):4
   ori(basic)	=	+in(ori):4
   ro(de)	=	+ro(winkeys):4
-  ro(us)	=	+ro(std_comma):4
-  ro(std)	=	+ro(std_cedilla):4
-  ro(academic)	=	+ro(std_comma):4
+  ro(us)	=	+ro(std):4
+  ro(academic)	=	+ro(std):4
   ru(os)	=	+ru(os_legacy):4
   sapmi(basic)	=	+no(smi):4
   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
@@ -693,9 +688,8 @@
   ogham		is434laptop	=	+ie(ogam_is434):2
   ori		basic	=	+in(ori):2
   ro		de	=	+ro(winkeys):2
-  ro		us	=	+ro(std_comma):2
-  ro		std	=	+ro(std_cedilla):2
-  ro		academic	=	+ro(std_comma):2
+  ro		us	=	+ro(std):2
+  ro		academic	=	+ro(std):2
   ru		os	=	+ru(os_legacy):2
   sapmi		basic	=	+no(smi):2
   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
@@ -741,9 +735,8 @@
   ogham		is434laptop	=	+ie(ogam_is434):3
   ori		basic	=	+in(ori):3
   ro		de	=	+ro(winkeys):3
-  ro		us	=	+ro(std_comma):3
-  ro		std	=	+ro(std_cedilla):3
-  ro		academic	=	+ro(std_comma):3
+  ro		us	=	+ro(std):3
+  ro		academic	=	+ro(std):3
   ru		os	=	+ru(os_legacy):3
   sapmi		basic	=	+no(smi):3
   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
@@ -789,9 +782,8 @@
   ogham		is434laptop	=	+ie(ogam_is434):4
   ori		basic	=	+in(ori):4
   ro		de	=	+ro(winkeys):4
-  ro		us	=	+ro(std_comma):4
-  ro		std	=	+ro(std_cedilla):4
-  ro		academic	=	+ro(std_comma):4
+  ro		us	=	+ro(std):4
+  ro		academic	=	+ro(std):4
   ru		os	=	+ru(os_legacy):4
   sapmi		basic	=	+no(smi):4
   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4