Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMike Gorse <mgorse@boston.site>
Mon, 13 Oct 2008 16:56:04 +0000 (11:56 -0500)
committerMike Gorse <mgorse@boston.site>
Mon, 13 Oct 2008 16:56:04 +0000 (11:56 -0500)

Trivial merge