Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 29 Apr 2008 17:12:56 +0000 (18:12 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 29 Apr 2008 17:12:56 +0000 (18:12 +0100)

Trivial merge