Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Tue, 29 Apr 2008 17:15:33 +0000 (13:15 -0400)
committerMike Gorse <mgorse@boston.site>
Tue, 29 Apr 2008 17:15:33 +0000 (13:15 -0400)

Trivial merge