Merge branch 'master' of git://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Mon, 9 Jun 2008 16:39:37 +0000 (12:39 -0400)
committerMike Gorse <mgorse@boston.site>
Mon, 9 Jun 2008 16:39:37 +0000 (12:39 -0400)
commit12cb5b0b812b823c639f2416b516657d033d3e49
treec1c0b094ff8a8c6c2c1f5ea1c4c7b4910a3927de
parentf735ca5541ecf4381fce6d571056540ad0e72b65
parentef25f02aa5044192c07e7d07b2a9c7b61582ddfe
Merge branch 'master' of git://git.codethink.co.uk/git/atspi-dbus into mgorse