Merge branch 'dbus-1.4'
authorRalf Habacker <ralf.habacker@freenet.de>
Tue, 20 Sep 2011 17:37:39 +0000 (19:37 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 20 Sep 2011 17:37:39 +0000 (19:37 +0200)

Trivial merge