Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Mon, 9 Jun 2008 16:29:23 +0000 (12:29 -0400)
committerMike Gorse <mgorse@boston.site>
Mon, 9 Jun 2008 16:29:23 +0000 (12:29 -0400)

Trivial merge