Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into droute
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 13 May 2008 15:20:18 +0000 (16:20 +0100)
1  2 
libspi/accessible.h
libspi/dbus.c

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