From: Mike Gorse <mgorse@boston.site>
Date: Mon, 16 Jun 2008 15:35:05 +0000 (-0400)
Subject: Merge ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
X-Git-Tag: AT_SPI2_CORE_0_1_3~213
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd88e740e05923106d7deb900e2f4d49af20b1ad;p=platform%2Fupstream%2Fat-spi2-core.git

Merge ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

Conflicts:

	atk-adaptor/bridge.c
---

dd88e740e05923106d7deb900e2f4d49af20b1ad