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)

Trivial merge