Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 25 Jul 2008 10:41:27 +0000 (11:41 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 25 Jul 2008 10:41:27 +0000 (11:41 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge