Merge branch 'my-dbus-1.2'
authorColin Walters <walters@verbum.org>
Thu, 28 Jan 2010 22:09:15 +0000 (17:09 -0500)
committerColin Walters <walters@verbum.org>
Thu, 28 Jan 2010 22:09:15 +0000 (17:09 -0500)
commit7a4cd46284dd634c165b5c4eb23606b7c0ff4ade
treebf0390d7c05896f538e8c6739108bb3d681f8ef7
parent1e82db47431fb19b78f8943c17d63227156e2432
parentb93476ce07acce83ff3b396616bb8a0eaf719916
Merge branch 'my-dbus-1.2'

Conflicts:
bus/Makefile.am
dbus/dbus-sysdeps-util-unix.c
dbus/dbus-transport.c
test/test-service.c
bus/Makefile.am
bus/bus.c
configure.in
dbus/Makefile.am
dbus/dbus-sysdeps-unix.c
dbus/dbus-sysdeps-util-unix.c
dbus/dbus-sysdeps.h
test/test-service.c