Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Wed, 28 May 2008 21:00:54 +0000 (17:00 -0400)
committerMike Gorse <mgorse@boston.site>
Wed, 28 May 2008 21:00:54 +0000 (17:00 -0400)
1  2 
atk-adaptor/bridge.c

Simple merge