Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Tue, 13 May 2008 20:52:09 +0000 (16:52 -0400)
committerMike Gorse <mgorse@boston.site>
Tue, 13 May 2008 20:52:09 +0000 (16:52 -0400)
Conflicts:

libspi/Makefile.am


No differences found