Merge branch 'dbus-1.2'

Conflicts:
	bus/bus.c
	bus/selinux.c
	configure.in

diff --cc bus/bus.c
Simple merge

diff --cc bus/dir-watch-default.c
index ff70d08,8e457eb..e7f8451
--- 1/bus/dir-watch-default.c
--- 2/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@@ -35,10 -35,6 +35,10 @@@ bus_watch_directory (const char *dir, B
  }
  
  void
- bus_watch_directory (const char *dir, BusContext *context)
+ bus_set_watched_dirs (BusContext *context, DBusList **directories)
  {
  }
 +
 +void bus_set_watched_dirs(BusContext *context, DBusList **dirs)
 +{
 +}

diff --cc bus/dir-watch-inotify.c
Simple merge

diff --cc dbus/dbus-string.c
Simple merge

diff --cc dbus/dbus-sysdeps.h
Simple merge