Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Fri, 25 Jul 2008 22:41:11 +0000 (17:41 -0500)
committerMike Gorse <mgorse@boston.site>
Fri, 25 Jul 2008 22:41:11 +0000 (17:41 -0500)
commit5eda62446a05fc5f35964ce9d9d7820ff0f91cf1
tree47a75ba53035db55598962969a6ce39e5e4694d6
parent18d922f77127850bef82b88f222325eef07a4782
parent11b7383c9c2a04127bdf68e276c013f7fb9be122
Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse