merge: device factory cleanups and first parts of devices-for-all (bgo #747429)
authorDan Williams <dcbw@redhat.com>
Wed, 6 May 2015 21:17:01 +0000 (16:17 -0500)
committerDan Williams <dcbw@redhat.com>
Wed, 6 May 2015 21:17:01 +0000 (16:17 -0500)

Trivial merge