Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:54:32 +0000 (17:54 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:54:32 +0000 (17:54 +0100)
commitfba068b572d32d232f4b2b3ac594e88aef5d0f1c
tree3ff7160a6258c6e9b80c78e5bec349cbcd7bffdd
parent613dc5600b5e84cd2108f9813fd1eb7cef4263e6
parent5c4b432c0279043434ca681f39b37f8c40eed425
Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework