Merge branch 'dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Sun, 7 Sep 2014 09:37:32 +0000 (11:37 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Sun, 7 Sep 2014 09:37:58 +0000 (11:37 +0200)

Trivial merge