Created attachment 13567 [details] [review]
geometry

Very well done patch, actually.
A couple of issues:
1. You forgot the vendor tag for base.xml.in. Not a big deal, I've added it.
2. For some reason, the whole keyboard look black in gnome-keyboard-properties. I'll try to figure out why.

(In reply to comment #2)
> 2. For some reason, the whole keyboard look black in gnome-keyboard-properties.
> I'll try to figure out why.

AFAIK, the problem is in Fn key, which has no keycode. The same problem exists in original thinkpad(us) layout. Adding fake keycode for Fn resolves the issue.

BTW, Fn key generates the same keycode (227) as Menu key, but only if it's pressed alone or with key which doesn't give valid combination with Fn.
I.e. Fn+Space gives keycode 249, while Fn+Z (or any other letter) gives 227.

Actually, it paints ok with the latest libgnomekbd - so let's leave it as it is. Though having a key without keycode is a bit odd, I must admit.