Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 29 Jul 2008 15:02:45 +0000 (16:02 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 29 Jul 2008 15:02:45 +0000 (16:02 +0100)

Trivial merge