Merge branch 'dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Tue, 21 Jan 2014 20:11:25 +0000 (21:11 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 21 Jan 2014 20:11:25 +0000 (21:11 +0100)

Trivial merge