device: merge branch 'jk/device-types-bgo762538'
authorThomas Haller <thaller@redhat.com>
Tue, 23 Feb 2016 16:41:57 +0000 (17:41 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 23 Feb 2016 22:17:40 +0000 (23:17 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=762538


Trivial merge