Merge branch 'master' of git://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Mon, 9 Jun 2008 16:39:37 +0000 (12:39 -0400)
committerMike Gorse <mgorse@boston.site>
Mon, 9 Jun 2008 16:39:37 +0000 (12:39 -0400)

Trivial merge