Merge branch 'dbus-1.2'
authorThiago Macieira <thiago@kde.org>
Tue, 21 Apr 2009 11:00:50 +0000 (13:00 +0200)
committerThiago Macieira <thiago@kde.org>
Tue, 21 Apr 2009 11:00:50 +0000 (13:00 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge