Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMike Gorse <mgorse@boston.site>
Sun, 28 Sep 2008 01:22:06 +0000 (20:22 -0500)
committerMike Gorse <mgorse@boston.site>
Sun, 28 Sep 2008 01:22:06 +0000 (20:22 -0500)

Trivial merge