merge: add blocking dispatcher pre-up and pre-down events (bgo #387832)
authorDan Williams <dcbw@redhat.com>
Fri, 6 Jun 2014 18:56:08 +0000 (13:56 -0500)
committerDan Williams <dcbw@redhat.com>
Fri, 6 Jun 2014 19:15:21 +0000 (14:15 -0500)
https://bugzilla.gnome.org/show_bug.cgi?id=387832
https://bugzilla.redhat.com/show_bug.cgi?id=1048345
https://bugzilla.redhat.com/show_bug.cgi?id=982734


Trivial merge