all: merge branch 'jk/device-types'
authorThomas Haller <thaller@redhat.com>
Tue, 23 Feb 2016 14:52:56 +0000 (15:52 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 23 Feb 2016 14:52:56 +0000 (15:52 +0100)
Resurrect old branch by Jirka, rebase it and
merge some parts.


Trivial merge