--- plugins/keyboard/gsd-keyboard-xkb.c	2009-07-17 17:47:09 +0400
+++ plugins/keyboard/gsd-keyboard-xkb.fixed.c	2009-07-17 19:43:58 +0400
@@ -252,11 +252,12 @@ apply_xkb_settings (void)
 	gkbd_keyboard_config_init (&current_sys_kbd_config,
 				   conf_client, xkl_engine);
 
-	gkbd_keyboard_config_load_from_gconf (&current_kbd_config,
-					      &initial_sys_kbd_config);
-
 	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
 						  NULL);
+//						  &initial_sys_kbd_config);
+
+	gkbd_keyboard_config_load_from_gconf (&current_kbd_config,
+					      &current_sys_kbd_config);
 
 	if (gdm_layout != NULL) {
 		/* If there are multiple layouts,