merge: add settings plugin for reading iBFT configuration (bgo #734009) (rh #990480)
authorDan Williams <dcbw@redhat.com>
Fri, 29 Aug 2014 23:51:34 +0000 (18:51 -0500)
committerDan Williams <dcbw@redhat.com>
Fri, 29 Aug 2014 23:51:34 +0000 (18:51 -0500)

Trivial merge