Merge branch 'tmp'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 14 Jan 2011 15:19:18 +0000 (15:19 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 14 Jan 2011 15:19:23 +0000 (15:19 +0000)
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32854

1  2 
configure.in

diff --cc configure.in
Simple merge