Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into droute
authorMark Doffman <mdoff@silver-wind.(none)>
Wed, 14 May 2008 13:12:41 +0000 (14:12 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Wed, 14 May 2008 13:12:41 +0000 (14:12 +0100)

Trivial merge