Merge branch 'dbus-1.2'
authorColin Walters <walters@verbum.org>
Tue, 16 Mar 2010 20:04:15 +0000 (16:04 -0400)
committerColin Walters <walters@verbum.org>
Tue, 16 Mar 2010 20:11:14 +0000 (16:11 -0400)
commitebfa7c02fd67777684d39389e25346819836dcca
tree93c2b9876ce960cbf2fa27dad9fb017184b7610b
parentacbc751e28446696fee92c236cfef176786409d5
parentce34415302af586ea6ca9b0da4b21a7025041ef7
Merge branch 'dbus-1.2'

Conflicts:
bus/bus.c
configure.in
12 files changed:
bus/bus.c
bus/bus.h
bus/dir-watch-inotify.c
bus/main.c
bus/selinux.c
configure.in
dbus/dbus-connection.c
dbus/dbus-spawn.c
dbus/dbus-sysdeps-util-unix.c
dbus/dbus-sysdeps.h
dbus/dbus-transport-socket.c
doc/dbus-specification.xml