Merge branch 'dbus-1.2'
authorColin Walters <walters@verbum.org>
Fri, 3 Sep 2010 18:46:53 +0000 (14:46 -0400)
committerColin Walters <walters@verbum.org>
Fri, 3 Sep 2010 18:46:53 +0000 (14:46 -0400)
commit87d324c3434b03214d82c6fc30cb7a6a754318ab
treefb8a3ebed2a8e2b20cb98001accb58195b51c4ed
parent45d53565bc13678d6aa5edec1d4efb5bf8a64e0b
parent8f2eb502a3c491b64012adb3ea8220a9952ce3c6
Merge branch 'dbus-1.2'

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