Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 25 Jul 2008 22:50:42 +0000 (23:50 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 25 Jul 2008 22:50:42 +0000 (23:50 +0100)
commit62a49248f15070d51881e4b42b6903801df67f55
tree633faa6eafd7539c3c6966ef792cd0266f8f2601
parentab7d6456dca045823c928aedbb716748ea62885b
parent5eda62446a05fc5f35964ce9d9d7820ff0f91cf1
Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus

Conflicts:

configure.ac