Index: xkeyboard-config/symbols/cd
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/cd,v
retrieving revision 1.2
diff -p -u -r1.2 cd
--- xkeyboard-config/symbols/cd	4 Sep 2006 20:25:10 -0000	1.2
+++ xkeyboard-config/symbols/cd	31 Mar 2007 22:36:03 -0000
@@ -22,7 +22,7 @@ xkb_symbols "basic" {
     key <AE07> { [parenright,          7, bracketright                    ] };
     key <AE08> { [0x01000302,          8, guillemotright                  ] };
     key <AE09> { [0x0100030c,          9                                  ] };
-    key <AE10> { [0x01000308,          0                                  ] };
+    key <AE10> { [0x01000308,          0, at                              ] };
     key <AE11> { [     minus,      underscore,   percent                  ] };
     key <AE12> { [     equal,      plus,       multiply,        division  ] };
 
@@ -36,7 +36,7 @@ xkb_symbols "basic" {
     key <AD08> { [	   i,          I,    0x01000268,       0x01000197 ] };
     key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
     key <AD10> { [	   p,          P                                  ] };
-    key <AD11> { [0x0100025B, 0x01000190 ] };
+    key <AD11> { [0x0100025B,      0x01000190,     asciicircum ] };
     key <AD12> { [ asterisk, asciicircum, dollar                ] };
 
     key <AC01> { [	   q,          Q                                  ] };
@@ -58,10 +58,10 @@ xkb_symbols "basic" {
     key <AB04> { [	   v,          V                                  ] };
     key <AB05> { [	   b,          B                                  ] };
     key <AB06> { [	   n,          N                                  ] };
-    key <AB07> { [     comma,     period                                  ] };
-    key <AB08> { [ semicolon,      colon                                  ] };
-    key <AB09> { [    exclam,   question                                  ] };
-    key <AB10> { [apostrophe,      slash,     0x01002019                  ] };
+    key <AB07> { [     comma,   question                              ] };
+    key <AB08> { [ semicolon,     period                              ] };
+    key <AB09> { [     colon,      slash                              ] };
+    key <AB10> { [    exclam,   apostrophe,     0x01002019           ] };
     key <BKSL> { [  quotedbl,  backslash,            bar                  ] };
 
     // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE