Merge branch 'dbus-1.2'
authorThiago Macieira <thiago@kde.org>
Sat, 17 May 2008 08:11:20 +0000 (10:11 +0200)
committerThiago Macieira <thiago@kde.org>
Sat, 17 May 2008 08:11:20 +0000 (10:11 +0200)

Trivial merge