Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMike Gorse <mgorse@boston.site>
Sat, 11 Oct 2008 17:59:31 +0000 (12:59 -0500)
committerMike Gorse <mgorse@boston.site>
Sat, 11 Oct 2008 17:59:31 +0000 (12:59 -0500)

Trivial merge