Merge branch 'cmake-fixes'
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>
Thu, 18 Nov 2010 13:26:38 +0000 (15:26 +0200)
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>
Thu, 18 Nov 2010 13:26:49 +0000 (15:26 +0200)
commit17a5b03603110b428eb8635d60e93f22cb7d4ff6
treecd5f3f7c3b62ca218129497cd78f66d74eb03c8f
parent500ce020cfe4b3d796f39600391ebbc115a88247
parentfbf4fccdc8304eee15bb59831992ffb785fe798b
Merge branch 'cmake-fixes'

Reviewed-by: Mauricio Piacentini <mauricio.piacentini@collabora.co.uk>