Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Wed, 30 Apr 2008 14:33:00 +0000 (10:33 -0400)
committerMike Gorse <mgorse@boston.site>
Wed, 30 Apr 2008 14:33:00 +0000 (10:33 -0400)

Trivial merge