Merge branch 'inline'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Oct 2007 16:24:18 +0000 (17:24 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Oct 2007 16:24:18 +0000 (17:24 +0100)
1  2 
ChangeLog
configure.in

diff --cc ChangeLog
Simple merge
diff --cc configure.in
Simple merge