Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into droute

author Mark Doffman <mdoff@silver-wind.(none)>

Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)

committer Mark Doffman <mdoff@silver-wind.(none)>

Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
author Mark Doffman <mdoff@silver-wind.(none)>
Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
committer Mark Doffman <mdoff@silver-wind.(none)>
Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
diff --cc libspi/accessible.h
Simple merge
diff --cc libspi/dbus.c
Simple merge
author	Mark Doffman <mdoff@silver-wind.(none)>
	Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
committer	Mark Doffman <mdoff@silver-wind.(none)>
	Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
		1	2
libspi/accessible.h	patch \|	diff1 \|	diff2 \|	blob \| history
libspi/dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history