merge: make Wi-Fi/OLPC Mesh support a plugin and misc cleanups (bgo #728432)
authorDan Williams <dcbw@redhat.com>
Tue, 13 May 2014 18:33:12 +0000 (13:33 -0500)
committerDan Williams <dcbw@redhat.com>
Tue, 13 May 2014 18:37:21 +0000 (13:37 -0500)

Trivial merge