Merge branch 'dbus-1.2'
authorColin Walters <walters@verbum.org>
Wed, 15 Jul 2009 21:39:17 +0000 (17:39 -0400)
committerColin Walters <walters@verbum.org>
Wed, 15 Jul 2009 21:39:17 +0000 (17:39 -0400)
commit56f7ce147e82c7eb529ccba634013e97d53b23c0
tree6d8cc496a85d5b631f643c97736637caa1c67f46
parent70c5285eb4b757fdd4e552e002c5d54072492152
parentc6992fc56cd1b2f502258e1db520c465ab2094bb
Merge branch 'dbus-1.2'

Conflicts:
configure.in
configure.in