Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Wed, 30 Apr 2008 14:33:00 +0000 (10:33 -0400)
committerMike Gorse <mgorse@boston.site>
Wed, 30 Apr 2008 14:33:00 +0000 (10:33 -0400)
commitc56b7a72c1afed81fff8131e0a1b3945b820eef0
treeee446f9c3e705a1a9256e8378e0d42cdb54a7577
parent709f8a10765a3bc90cfc4d8f77cd850a0cd09831
parent7d5c37625c4232a61c25c6adf8731a5f9ec3ee32
Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse