Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:36:49 +0000 (17:36 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:36:49 +0000 (17:36 +0100)
commit613dc5600b5e84cd2108f9813fd1eb7cef4263e6
treeadae0ef6d3fc664331f14f62ad257c6fbb30f08a
parentf6ca06461319b20463f96a5b37544a540aee11ca
parent32dd48c94efe4fe47147bbf066389dde688cd355
Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework