Merge branch 'master' of ssh://karsten@git.fedorahosted.org/git/hwdata