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

Conflicts:
dbus/dbus-sysdeps-util-unix.c