Merge branch 'master' of ssh://git.freedesktop.org/git/xkeyboard-config
authorSergey V. Udaltsov <svu@linnie-the-pooh.(none)>
Sat, 14 Feb 2009 18:21:00 +0000 (18:21 +0000)
committerSergey V. Udaltsov <svu@linnie-the-pooh.(none)>
Sat, 14 Feb 2009 18:21:00 +0000 (18:21 +0000)

Trivial merge