Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:54:32 +0000 (17:54 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:54:32 +0000 (17:54 +0100)

Trivial merge