Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Thu, 16 Oct 2008 19:45:21 +0000 (20:45 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Thu, 16 Oct 2008 19:45:21 +0000 (20:45 +0100)

Trivial merge