Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into testing
authorMark Doffman <mdoff@silver-wind.(none)>
Mon, 26 May 2008 17:02:36 +0000 (18:02 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Mon, 26 May 2008 17:02:36 +0000 (18:02 +0100)
1  2 
atk-adaptor/bridge.c

Simple merge