Merge branch 'dbus-1.2'

Conflicts:
	bus/dispatch.c
	configure.in
	test/name-test/test-names.c

diff --cc bus/bus.c
Simple merge

diff --cc configure.in
Simple merge

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

diff --cc dbus/dbus-marshal-basic.c
Simple merge

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

diff --cc tools/dbus-print-message.c
Simple merge