Merge branch 'dbus-1.2'
authorThiago Macieira <thiago@kde.org>
Wed, 13 May 2009 13:52:26 +0000 (15:52 +0200)
committerThiago Macieira <thiago@kde.org>
Wed, 13 May 2009 13:52:26 +0000 (15:52 +0200)

Trivial merge