Merge ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Mon, 16 Jun 2008 15:35:05 +0000 (11:35 -0400)
committerMike Gorse <mgorse@boston.site>
Mon, 16 Jun 2008 15:35:05 +0000 (11:35 -0400)
commitdd88e740e05923106d7deb900e2f4d49af20b1ad
tree72ba75e9772052884a95f5224354acf772187344
parent72cb9b8b032b3f405eb104c09459f1e55951bad3
parent540b46a2589d27ba52e45eee8c2b0a21265799c5
Merge ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

Conflicts:

atk-adaptor/bridge.c
atk-adaptor/bridge.c