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)
commit84d4ed242ac0ca9cc9ade4c09539d71edd061541
tree825f273b2ff4e264433216dae242366882f1934e
parent5b6369d783e3415561c13a6b03bb17c06b90824e
parent297919ae6189af3db9eb8b16488102fd0d2f5a43
Merge branch 'tmp'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32854
configure.in