Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Tue, 13 May 2008 20:52:09 +0000 (16:52 -0400)
committerMike Gorse <mgorse@boston.site>
Tue, 13 May 2008 20:52:09 +0000 (16:52 -0400)
commite879a45ddc5f82a93b2be5dcc00b8d6640d37b42
treeaff3304072163618a185409a04373536eddd1edf
parentfe57252569727cafcf3228f261403303f1acd9fb
parent36fefb5b4adc107512fc06fc64700856d0cce9c0
Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

Conflicts:

libspi/Makefile.am
atk-bridge/bridge.c
libspi/Makefile.am
libspi/accessible.h
libspi/dbus.c