Merge branch 'master' of git+ssh://git.freedesktop.org/git/xkeyboard-config
authorSergey V. Udaltsov <svu@gnome.org>
Mon, 26 Dec 2011 12:30:23 +0000 (12:30 +0000)
committerSergey V. Udaltsov <svu@gnome.org>
Mon, 26 Dec 2011 12:30:23 +0000 (12:30 +0000)

Trivial merge