Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into droute