Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMike Gorse <mgorse@boston.site>
Sun, 12 Oct 2008 14:24:26 +0000 (09:24 -0500)
committerMike Gorse <mgorse@boston.site>
Sun, 12 Oct 2008 14:24:26 +0000 (09:24 -0500)

Trivial merge