xkeyboard-config: fix autoreconf
Merge branch 'master' into vnsi4
Merge branch 'vnsi4' of https://github.com/CharlieMarshall/OpenELEC.tv into vnsi4