xkbcomp: Please merge a reviewed patch

[wettstae at gmail.com]

Dear all,

A while ago, I submitted the following patch for xkbcomp, related to
locking and ISOLock:

  http://patchwork.freedesktop.org/patch/20376/

It has been reviewed, but not merged yet.  Can somebody please merge
this patch?

Apart from fixing incorrect behaviour, this patch brings the foundations
do address bug #56491 (for xkeyboard-config).

Thank you,

Andreas