Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Wed, 28 May 2008 21:48:23 +0000 (17:48 -0400)
committerMike Gorse <mgorse@boston.site>
Wed, 28 May 2008 21:48:23 +0000 (17:48 -0400)

Trivial merge