Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMike Gorse <mgorse@boston.site>
Tue, 19 Aug 2008 18:28:39 +0000 (13:28 -0500)
committerMike Gorse <mgorse@boston.site>
Tue, 19 Aug 2008 18:28:39 +0000 (13:28 -0500)

Trivial merge