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)
commitc1989c1a4f013085fe5eceb6bffa89d1e1b66bf5
treee9a9da4e9548798f34e2f6834c1defa1fa529f19
parent775f77c719de325a0cbf8fb1d56ebbb8f6a923d7
parent70b0ffd50188001c261f0c88400ce9b09b25669e
Merge branch 'dbus-1.4'