Merge remote-tracking branch 'micro/fix-build'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Mar 2015 08:43:38 +0000 (09:43 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Mar 2015 08:43:38 +0000 (09:43 +0100)

Trivial merge