Comment 6 for bug 779509

Ok...but do you have two keyboard layouts to choose from or only one? Does the indicator applet show in the tray accordingly?
What keyboard did you choose during Natty first installation? Is it the same one as the layout you use now or did you add an additional keyboard layout afterward?
It seems to me that the french Ubuntu desktop I used for version upgrade has added the french azerty layout as a default although I asked for the swiss french layout...then I had to add the missing fr_CH layout and now I cannot get rid of the french layout which I don't need - after each reboot, the french layout reappears as default although it was removed in the previous session!
A possible clue is that there is a system-wide parameter somewhere that is used early at boot; and it would add the wrong keyboard and select it as default among possible configured layouts (which I think are stored in the gconf key /desktop/gnome/peripherals/keyboard/kbd).