Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMike Gorse <mgorse@boston.site>
Thu, 9 Oct 2008 13:40:14 +0000 (08:40 -0500)
committerMike Gorse <mgorse@boston.site>
Thu, 9 Oct 2008 13:40:14 +0000 (08:40 -0500)

Trivial merge